summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2024-06-20 13:56:19 -0700
committerPaolo Abeni <pabeni@redhat.com>2024-06-25 11:10:18 +0200
commit7202cb591624b860bd7b688d4bd0f5bee79c7f44 (patch)
tree7492d812396b3681da21104736ac3416c5f85c72
parentc4da4661d985fd3cbaea3ea6101e2dd0d2ad4b74 (diff)
downloadlwn-7202cb591624b860bd7b688d4bd0f5bee79c7f44.tar.gz
lwn-7202cb591624b860bd7b688d4bd0f5bee79c7f44.zip
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 <kuniyu@amazon.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-rw-r--r--include/net/af_unix.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index c42645199cee..63129c79b8cb 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