Commit 06b4b681 authored by Trond Myklebust's avatar Trond Myklebust

SUNRPC: remove XS_SENDMSG_RETRY

The condition for exiting from the loop in xs_tcp_send_request() should be
that we find we're not making progress (i.e. number of bytes sent is 0).
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d2b83141
...@@ -135,12 +135,6 @@ static ctl_table sunrpc_table[] = { ...@@ -135,12 +135,6 @@ static ctl_table sunrpc_table[] = {
#endif #endif
/*
* How many times to try sending a request on a socket before waiting
* for the socket buffer to clear.
*/
#define XS_SENDMSG_RETRY (10U)
/* /*
* Time out for an RPC UDP socket connect. UDP socket connects are * Time out for an RPC UDP socket connect. UDP socket connects are
* synchronous, but we set a timeout anyway in case of resource * synchronous, but we set a timeout anyway in case of resource
...@@ -666,7 +660,6 @@ static int xs_tcp_send_request(struct rpc_task *task) ...@@ -666,7 +660,6 @@ static int xs_tcp_send_request(struct rpc_task *task)
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
struct xdr_buf *xdr = &req->rq_snd_buf; struct xdr_buf *xdr = &req->rq_snd_buf;
int status; int status;
unsigned int retry = 0;
xs_encode_tcp_record_marker(&req->rq_snd_buf); xs_encode_tcp_record_marker(&req->rq_snd_buf);
...@@ -697,8 +690,9 @@ static int xs_tcp_send_request(struct rpc_task *task) ...@@ -697,8 +690,9 @@ static int xs_tcp_send_request(struct rpc_task *task)
return 0; return 0;
} }
if (status != 0)
continue;
status = -EAGAIN; status = -EAGAIN;
if (retry++ > XS_SENDMSG_RETRY)
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment