| Message ID | 20240526145718.9542-1-gouhao@uniontech.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c65b6521115ed478471bf8c4a3687059fcea01aa |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2] net/core: remove redundant sk_callback_lock initialization | expand |
On Sun, May 26, 2024 at 10:57:17PM +0800, Gou Hao wrote: > 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>
Hello: This series was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Sun, 26 May 2024 22:57:17 +0800 you wrote: > sk_callback_lock has already been initialized in sk_init_common(). > > Signed-off-by: Gou Hao <gouhao@uniontech.com> > --- > net/core/sock.c | 1 - > 1 file changed, 1 deletion(-) Here is the summary with links: - [1/2] net/core: remove redundant sk_callback_lock initialization https://git.kernel.org/netdev/net-next/c/c65b6521115e - [2/2] net/core: move the lockdep-init of sk_callback_lock to sk_init_common() https://git.kernel.org/netdev/net-next/c/de31e96cf423 You are awesome, thank you!
diff --git a/net/core/sock.c b/net/core/sock.c index 8629f9aecf91..67b10954e0cf 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,
sk_callback_lock has already been initialized in sk_init_common(). Signed-off-by: Gou Hao <gouhao@uniontech.com> --- net/core/sock.c | 1 - 1 file changed, 1 deletion(-)