From: Ingo Molnar Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton --- include/net/sock.h | 3 +++ net/ipv4/tcp_ipv4.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff -puN include/net/sock.h~lock-validator-special-locking-bh_lock_sock include/net/sock.h --- devel/include/net/sock.h~lock-validator-special-locking-bh_lock_sock 2006-05-29 18:13:27.000000000 -0700 +++ devel-akpm/include/net/sock.h 2006-05-29 18:13:27.000000000 -0700 @@ -740,6 +740,9 @@ extern void FASTCALL(release_sock(struct /* BH context may only use the following locking interface. */ #define bh_lock_sock(__sk) spin_lock(&((__sk)->sk_lock.slock)) +#define bh_lock_sock_nested(__sk) \ + spin_lock_nested(&((__sk)->sk_lock.slock), \ + SINGLE_DEPTH_NESTING) #define bh_unlock_sock(__sk) spin_unlock(&((__sk)->sk_lock.slock)) extern struct sock *sk_alloc(int family, diff -puN net/ipv4/tcp_ipv4.c~lock-validator-special-locking-bh_lock_sock net/ipv4/tcp_ipv4.c --- devel/net/ipv4/tcp_ipv4.c~lock-validator-special-locking-bh_lock_sock 2006-05-29 18:13:27.000000000 -0700 +++ devel-akpm/net/ipv4/tcp_ipv4.c 2006-05-29 18:13:27.000000000 -0700 @@ -1089,7 +1089,7 @@ process: skb->dev = NULL; - bh_lock_sock(sk); + bh_lock_sock_nested(sk); ret = 0; if (!sock_owned_by_user(sk)) { #ifdef CONFIG_NET_DMA _