提交 8eb3d9fb 编写于 作者: T Trond Myklebust 提交者: Xie XiuQi

SUNRPC: Fix a race with XPRT_CONNECTING

[ Upstream commit cf76785d30712d90185455e752337acdb53d2a5d ]

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: NTrond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: NChuck Lever <chuck.lever@oracle.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 16f5aaa2
...@@ -2244,8 +2244,8 @@ static void xs_udp_setup_socket(struct work_struct *work) ...@@ -2244,8 +2244,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);
} }
...@@ -2480,8 +2480,8 @@ static void xs_tcp_setup_socket(struct work_struct *work) ...@@ -2480,8 +2480,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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册