diff options
| author | Trond Myklebust | 2015-09-17 16:42:27 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2015-09-17 21:48:23 +0200 |
| commit | 03c78827db35be20ffa71cb5ccd2cedb192f95d6 (patch) | |
| tree | e64e3c88c8ff27ec1ebda067b088ae4dbbca59d2 | |
| parent | nfs: fix pg_test page count calculation (diff) | |
| download | kernel-qcow2-linux-03c78827db35be20ffa71cb5ccd2cedb192f95d6.tar.gz kernel-qcow2-linux-03c78827db35be20ffa71cb5ccd2cedb192f95d6.tar.xz kernel-qcow2-linux-03c78827db35be20ffa71cb5ccd2cedb192f95d6.zip | |
SUNRPC: Fix races between socket connection and destroy code
When we're destroying the socket transport, we need to ensure that
we cancel any existing delayed connection attempts, and order them
w.r.t. the call to xs_close().
Reported-by:"Suzuki K. Poulose" <suzuki.poulose@arm.com>
Acked-by: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | net/sunrpc/xprtsock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 7be90bc1a7c2..d2dfbd043bea 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -881,8 +881,11 @@ static void xs_xprt_free(struct rpc_xprt *xprt) */ static void xs_destroy(struct rpc_xprt *xprt) { + struct sock_xprt *transport = container_of(xprt, + struct sock_xprt, xprt); dprintk("RPC: xs_destroy xprt %p\n", xprt); + cancel_delayed_work_sync(&transport->connect_worker); xs_close(xprt); xs_xprt_free(xprt); module_put(THIS_MODULE); |