提交 e7937c1f 编写于 作者: A Alexander Aring 提交者: Zheng Zengkai

fs: dlm: use sk->sk_socket instead of con->sock

stable inclusion
from stable-v5.10.94
commit 98923ebb034b8c405c5e9e216834021fe72d7875
bugzilla: https://gitee.com/openeuler/kernel/issues/I531X9

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=98923ebb034b8c405c5e9e216834021fe72d7875

--------------------------------

[ Upstream commit feb704bd ]

Instead of dereference "con->sock" we can get the socket structure over
"sk->sk_socket" as well. This patch will switch to this behaviour.
Signed-off-by: NAlexander Aring <aahringo@redhat.com>
Signed-off-by: NDavid Teigland <teigland@redhat.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 34e8687d
...@@ -480,8 +480,7 @@ static void lowcomms_error_report(struct sock *sk) ...@@ -480,8 +480,7 @@ static void lowcomms_error_report(struct sock *sk)
goto out; goto out;
orig_report = listen_sock.sk_error_report; orig_report = listen_sock.sk_error_report;
if (con->sock == NULL || if (kernel_getpeername(sk->sk_socket, (struct sockaddr *)&saddr) < 0) {
kernel_getpeername(con->sock, (struct sockaddr *)&saddr) < 0) {
printk_ratelimited(KERN_ERR "dlm: node %d: socket error " printk_ratelimited(KERN_ERR "dlm: node %d: socket error "
"sending to node %d, port %d, " "sending to node %d, port %d, "
"sk_err=%d/%d\n", dlm_our_nodeid(), "sk_err=%d/%d\n", dlm_our_nodeid(),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册