From: Gou Hao <gouhao@uniontech.com>
Date: Sun, 26 May 2024 14:57:17 +0000 (+0800)
Subject: net/core: remove redundant sk_callback_lock initialization
X-Git-Tag: v6.11-rc1~163^2~311
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c65b6521115ed478471bf8c4a3687059fcea01aa;p=thirdparty%2Flinux.git

net/core: remove redundant sk_callback_lock initialization

sk_callback_lock has already been initialized in sk_init_common().

Signed-off-by: Gou Hao <gouhao@uniontech.com>
Reviewed-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20240526145718.9542-1-gouhao@uniontech.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index 8629f9aecf91a..67b10954e0cfb 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3460,7 +3460,6 @@ void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid)
 	}
 	sk->sk_uid	=	uid;
 
-	rwlock_init(&sk->sk_callback_lock);
 	if (sk->sk_kern_sock)
 		lockdep_set_class_and_name(
 			&sk->sk_callback_lock,