fs: dlm: use sk->sk_socket instead of con->sock
authorAlexander Aring <aahringo@redhat.com>
Fri, 16 Jul 2021 20:22:34 +0000 (16:22 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 09:53:48 +0000 (10:53 +0100)
[ Upstream commit feb704bd17786c8ff52a49d7759b8ee4f3a5aaac ]

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: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/dlm/lowcomms.c

index 0c78fdfb1f6faaec81253a6535055cef23a0acc8..0a8645ed4b2d6c7d114a99776e621f5168b54950 100644 (file)
@@ -480,8 +480,7 @@ static void lowcomms_error_report(struct sock *sk)
                goto out;
 
        orig_report = listen_sock.sk_error_report;
-       if (con->sock == NULL ||
-           kernel_getpeername(con->sock, (struct sockaddr *)&saddr) < 0) {
+       if (kernel_getpeername(sk->sk_socket, (struct sockaddr *)&saddr) < 0) {
                printk_ratelimited(KERN_ERR "dlm: node %d: socket error "
                                   "sending to node %d, port %d, "
                                   "sk_err=%d/%d\n", dlm_our_nodeid(),