diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:42 +0000 |
| commit | 37763c8d1e5e8c4b755b7aa3f77c2f0a67654cc8 (patch) | |
| tree | 2db37841b64998802b8d818e20eb5c246fa4aa65 /net/sunrpc | |
| parent | cc3d2fb369a274c678f5571c1a1a33c3c3fc5afb (diff) | |
| parent | 561ba47707bf63cac3d97143ab5928353d47459e (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 8a0e04d0928a..fc47165dc254 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -502,6 +502,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); + struct sock *sk = transport->inet; int ret = -EAGAIN; dprintk("RPC: %5u xmit incomplete (%u left of %u)\n", @@ -519,7 +520,7 @@ static int xs_nospace(struct rpc_task *task) * window size */ set_bit(SOCK_NOSPACE, &transport->sock->flags); - transport->inet->sk_write_pending++; + sk->sk_write_pending++; /* ...and wait for more buffer space */ xprt_wait_for_buffer_space(task, xs_nospace_callback); } @@ -529,6 +530,9 @@ static int xs_nospace(struct rpc_task *task) } spin_unlock_bh(&xprt->transport_lock); + + /* Race breaker in case memory is freed before above code is called */ + sk->sk_write_space(sk); return ret; } |