Commit 443aef0e authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds

lockdep: fixup sk_callback_lock annotation

the two init sites resulted in inconsistend names for the lock class.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b32d0a4
...@@ -171,6 +171,19 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = { ...@@ -171,6 +171,19 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = {
"slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" , "slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" ,
"slock-AF_RXRPC" , "slock-AF_MAX" "slock-AF_RXRPC" , "slock-AF_MAX"
}; };
static const char *af_family_clock_key_strings[AF_MAX+1] = {
"clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
"clock-AF_AX25" , "clock-AF_IPX" , "clock-AF_APPLETALK",
"clock-AF_NETROM", "clock-AF_BRIDGE" , "clock-AF_ATMPVC" ,
"clock-AF_X25" , "clock-AF_INET6" , "clock-AF_ROSE" ,
"clock-AF_DECnet", "clock-AF_NETBEUI" , "clock-AF_SECURITY" ,
"clock-AF_KEY" , "clock-AF_NETLINK" , "clock-AF_PACKET" ,
"clock-AF_ASH" , "clock-AF_ECONET" , "clock-AF_ATMSVC" ,
"clock-21" , "clock-AF_SNA" , "clock-AF_IRDA" ,
"clock-AF_PPPOX" , "clock-AF_WANPIPE" , "clock-AF_LLC" ,
"clock-27" , "clock-28" , "clock-29" ,
"clock-AF_TIPC" , "clock-AF_BLUETOOTH", "clock-AF_MAX"
};
#endif #endif
/* /*
...@@ -941,8 +954,9 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) ...@@ -941,8 +954,9 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
rwlock_init(&newsk->sk_dst_lock); rwlock_init(&newsk->sk_dst_lock);
rwlock_init(&newsk->sk_callback_lock); rwlock_init(&newsk->sk_callback_lock);
lockdep_set_class(&newsk->sk_callback_lock, lockdep_set_class_and_name(&newsk->sk_callback_lock,
af_callback_keys + newsk->sk_family); af_callback_keys + newsk->sk_family,
af_family_clock_key_strings[newsk->sk_family]);
newsk->sk_dst_cache = NULL; newsk->sk_dst_cache = NULL;
newsk->sk_wmem_queued = 0; newsk->sk_wmem_queued = 0;
...@@ -1530,8 +1544,9 @@ void sock_init_data(struct socket *sock, struct sock *sk) ...@@ -1530,8 +1544,9 @@ void sock_init_data(struct socket *sock, struct sock *sk)
rwlock_init(&sk->sk_dst_lock); rwlock_init(&sk->sk_dst_lock);
rwlock_init(&sk->sk_callback_lock); rwlock_init(&sk->sk_callback_lock);
lockdep_set_class(&sk->sk_callback_lock, lockdep_set_class_and_name(&sk->sk_callback_lock,
af_callback_keys + sk->sk_family); af_callback_keys + sk->sk_family,
af_family_clock_key_strings[sk->sk_family]);
sk->sk_state_change = sock_def_wakeup; sk->sk_state_change = sock_def_wakeup;
sk->sk_data_ready = sock_def_readable; sk->sk_data_ready = sock_def_readable;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment