Le mercredi 22 septembre 2010 Ã 10:31 +0200, Eric Dumazet a Ãcrit : > diff --git a/net/core/sock.c b/net/core/sock.c > index b05b9b6..afd0f69 100644 > --- a/net/core/sock.c > +++ b/net/core/sock.c > @@ -1210,7 +1210,9 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) > spin_lock_init(&newsk->sk_dst_lock); > rwlock_init(&newsk->sk_callback_lock); > lockdep_set_class_and_name(&newsk->sk_callback_lock, > - af_callback_keys + newsk->sk_family, > + sk->sk_prot->callback_key ? > + sk->sk_prot->callback_key : > + af_callback_keys + newsk->sk_family, > af_family_clock_key_strings[newsk->sk_family]); > > newsk->sk_dst_cache = NULL; > @@ -1965,6 +1967,9 @@ void sock_init_data(struct socket *sock, struct sock *sk) > spin_lock_init(&sk->sk_dst_lock); > rwlock_init(&sk->sk_callback_lock); > lockdep_set_class_and_name(&sk->sk_callback_lock, > + sk->sk_prot->callback_key ? > + sk->sk_prot->callback_key : > + af_callback_keys + newsk->sk_family, small bug in my patch , please delete the orphan line : > af_callback_keys + sk->sk_family, > af_family_clock_key_strings[sk->sk_family]); > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
