Skip to content

Commit

Permalink
SUNRPC: remove XS_SENDMSG_RETRY
Browse files Browse the repository at this point in the history
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: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Apr 19, 2008
1 parent d2b8314 commit 06b4b68
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions net/sunrpc/xprtsock.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,6 @@ static ctl_table sunrpc_table[] = {

#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
* synchronous, but we set a timeout anyway in case of resource
Expand Down Expand Up @@ -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 xdr_buf *xdr = &req->rq_snd_buf;
int status;
unsigned int retry = 0;

xs_encode_tcp_record_marker(&req->rq_snd_buf);

Expand Down Expand Up @@ -697,9 +690,10 @@ static int xs_tcp_send_request(struct rpc_task *task)
return 0;
}

if (status != 0)
continue;
status = -EAGAIN;
if (retry++ > XS_SENDMSG_RETRY)
break;
break;
}

switch (status) {
Expand Down

0 comments on commit 06b4b68

Please sign in to comment.