---

yaml --- r: 194335 b: refs/heads/master c: f68c224 h: refs/heads/master i: 194333: d460da8 194331: 0391437 194327: cbcda8f 194319: 77b81de 194303: 74a32d6 v: v3
git-mirror · Apr 22, 2010 · f59df14 · f59df14
1 parent 1034a60
commit f59df14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40eaf96271526a9f71030dd1a199ce46c045752e
+refs/heads/master: f68c224fedff2157f3fad7f7da674cbc96567c84
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -1197,7 +1197,8 @@ static inline struct dst_entry *
 __sk_dst_get(struct sock *sk)
 {
 	return rcu_dereference_check(sk->sk_dst_cache, rcu_read_lock_held() ||
-						       sock_owned_by_user(sk));
+						       sock_owned_by_user(sk) ||
+						       lockdep_is_held(&sk->sk_lock.slock));
 }
 
 static inline struct dst_entry *