From: Kuniyuki Iwashima Date: Thu, 20 Jun 2024 20:56:19 +0000 (-0700) Subject: af_unix: Remove U_LOCK_GC_LISTENER. X-Git-Tag: v6.11-rc1~163^2~146^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7202cb591624b860bd7b688d4bd0f5bee79c7f44;p=thirdparty%2Fkernel%2Flinux.git af_unix: Remove U_LOCK_GC_LISTENER. Commit 1971d13ffa84 ("af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().") added U_LOCK_GC_LISTENER for the old GC, but it's no longer needed for the new GC. Let's remove U_LOCK_GC_LISTENER and unix_state_lock_nested() as there's no user. Signed-off-by: Kuniyuki Iwashima Signed-off-by: Paolo Abeni --- diff --git a/include/net/af_unix.h b/include/net/af_unix.h index c42645199cee3..63129c79b8cbc 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -96,18 +96,6 @@ struct unix_sock { #define unix_state_lock(s) spin_lock(&unix_sk(s)->lock) #define unix_state_unlock(s) spin_unlock(&unix_sk(s)->lock) -enum unix_socket_lock_class { - U_LOCK_NORMAL, - U_LOCK_GC_LISTENER, /* used for listening socket while determining gc - * candidates to close a small race window. - */ -}; - -static inline void unix_state_lock_nested(struct sock *sk, - enum unix_socket_lock_class subclass) -{ - spin_lock_nested(&unix_sk(sk)->lock, subclass); -} #define peer_wait peer_wq.wait