From f59df14fa299eb4267901223088be79ed0c353e6 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 22 Apr 2010 16:06:59 -0700
Subject: [PATCH] --- yaml --- r: 194335 b: refs/heads/master c:
 f68c224fedff2157f3fad7f7da674cbc96567c84 h: refs/heads/master i:   194333:
 d460da8b3bd0f7eef2b521c79d0e1d5d545bcfdb   194331:
 0391437861c2c7469dab2223e13be0a536ebd9e8   194327:
 cbcda8f9269a74177121fa0ad8c6c7520206b3db   194319:
 77b81de52ce2d265221206b0c5b890a66d427370   194303:
 74a32d666a067e1a1715da42f0c1dec058341339 v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d838f75283ab..f553b299f1ca 100644
--- 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
index 8ab05146a447..86a8ca177a29 100644
--- 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 *