diff options
| author | Trond Myklebust | 2007-11-06 16:18:36 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2008-01-30 08:05:24 +0100 |
| commit | 66af1e558538137080615e7ad6d1f2f80862de01 (patch) | |
| tree | f5f9680b86846d4df8312cd9bd729d6e10c7b5e8 /net/sunrpc/xprtsock.c | |
| parent | NFS: Stop sillyname renames and unmounts from racing (diff) | |
| download | kernel-qcow2-linux-66af1e558538137080615e7ad6d1f2f80862de01.tar.gz kernel-qcow2-linux-66af1e558538137080615e7ad6d1f2f80862de01.tar.xz kernel-qcow2-linux-66af1e558538137080615e7ad6d1f2f80862de01.zip | |
SUNRPC: Fix a race in xs_tcp_state_change()
When scheduling the autoclose RPC call, we want to ensure that we don't
race against the test_bit() call in xprt_clear_locked().
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 6fa52f44de0f..abb40c140738 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1122,10 +1122,7 @@ static void xs_tcp_state_change(struct sock *sk) case TCP_SYN_RECV: break; case TCP_CLOSE_WAIT: - /* Try to schedule an autoclose RPC calls */ - set_bit(XPRT_CLOSE_WAIT, &xprt->state); - if (test_and_set_bit(XPRT_LOCKED, &xprt->state) == 0) - queue_work(rpciod_workqueue, &xprt->task_cleanup); + xprt_force_disconnect(xprt); default: xprt_disconnect(xprt); } |