diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 17:59:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 17:59:11 +0100 |
| commit | f02877ce3ca8f87a086e3fc98bb9e022bbec70ec (patch) | |
| tree | 8ea602e020162117bb259be5c17b9cda24fb5176 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared (diff) | |
| download | linux-f02877ce3ca8f87a086e3fc98bb9e022bbec70ec.tar.xz linux-f02877ce3ca8f87a086e3fc98bb9e022bbec70ec.zip | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared
| -rw-r--r-- | net/sunrpc/xprtsock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 2d78d95955ab..55472c48825e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -496,7 +496,7 @@ static int xs_nospace(struct rpc_task *task) struct rpc_rqst *req = task->tk_rqstp; struct rpc_xprt *xprt = req->rq_xprt; struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); - int ret = 0; + int ret = -EAGAIN; dprintk("RPC: %5u xmit incomplete (%u left of %u)\n", task->tk_pid, req->rq_slen - req->rq_bytes_sent, @@ -508,7 +508,6 @@ static int xs_nospace(struct rpc_task *task) /* Don't race with disconnect */ if (xprt_connected(xprt)) { if (test_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags)) { - ret = -EAGAIN; /* * Notify TCP that we're limited by the application * window size |