leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: Fix a race with XPRT_CONNECTING

Browse Source 
Ensure that we clear XPRT_CONNECTING before releasing the XPRT_LOCK so that
we don't have races between the (asynchronous) socket setup code and
tasks in xprt_connect().

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Trond Myklebust
2018-12-17 17:38:51 -05:00
parent 0445f92c5d
commit cf76785d30
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/xprtsock.c
View File

@@ -2090,8 +2090,8 @@ static void xs_udp_setup_socket(struct work_struct *work)
trace_rpc_socket_connect(xprt, sock, 0); trace_rpc_socket_connect(xprt, sock, 0);
status = 0; status = 0;
out: out:
xprt_unlock_connect(xprt, transport);
xprt_clear_connecting(xprt); xprt_clear_connecting(xprt);
xprt_unlock_connect(xprt, transport);
xprt_wake_pending_tasks(xprt, status); xprt_wake_pending_tasks(xprt, status);
} }
@@ -2327,8 +2327,8 @@ static void xs_tcp_setup_socket(struct work_struct *work)
} }
status = -EAGAIN; status = -EAGAIN;
out: out:
xprt_unlock_connect(xprt, transport);
xprt_clear_connecting(xprt); xprt_clear_connecting(xprt);
xprt_unlock_connect(xprt, transport);
xprt_wake_pending_tasks(xprt, status); xprt_wake_pending_tasks(xprt, status);
} }