diff options
| author | Trond Myklebust | 2015-06-02 17:53:21 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2015-06-02 19:30:35 +0200 |
| commit | 1193d58f75faec6ccdaf24cbd3471f5460a0a906 (patch) | |
| tree | 0b4f3f0b815116d3657443165a4665caea84881c /net/sunrpc/clnt.c | |
| parent | SUNRPC: Fix a memory leak in the backchannel code (diff) | |
| download | kernel-qcow2-linux-1193d58f75faec6ccdaf24cbd3471f5460a0a906.tar.gz kernel-qcow2-linux-1193d58f75faec6ccdaf24cbd3471f5460a0a906.tar.xz kernel-qcow2-linux-1193d58f75faec6ccdaf24cbd3471f5460a0a906.zip | |
SUNRPC: Backchannel handle socket nospace
If the socket was busy due to a socket nospace error, then we should
retry the send.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index e6ce1517367f..fa70f663eb92 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1951,24 +1951,22 @@ call_bc_transmit(struct rpc_task *task) { struct rpc_rqst *req = task->tk_rqstp; - if (!xprt_prepare_transmit(task)) { - /* - * Could not reserve the transport. Try again after the - * transport is released. - */ - task->tk_status = 0; - task->tk_action = call_bc_transmit; - return; - } + if (!xprt_prepare_transmit(task)) + goto out_retry; - task->tk_action = rpc_exit_task; if (task->tk_status < 0) { printk(KERN_NOTICE "RPC: Could not send backchannel reply " "error: %d\n", task->tk_status); - return; + goto out_done; } + if (req->rq_connect_cookie != req->rq_xprt->connect_cookie) + req->rq_bytes_sent = 0; xprt_transmit(task); + + if (task->tk_status == -EAGAIN) + goto out_nospace; + xprt_end_transmit(task); dprint_status(task); switch (task->tk_status) { @@ -2002,6 +2000,13 @@ call_bc_transmit(struct rpc_task *task) break; } rpc_wake_up_queued_task(&req->rq_xprt->pending, task); +out_done: + task->tk_action = rpc_exit_task; + return; +out_nospace: + req->rq_connect_cookie = req->rq_xprt->connect_cookie; +out_retry: + task->tk_status = 0; } #endif /* CONFIG_SUNRPC_BACKCHANNEL */ |