---

yaml --- r: 194541 b: refs/heads/master c: 0b53ff2 h: refs/heads/master i: 194539: 0a3374a v: v3
git-mirror · Apr 27, 2010 · c6f86b4 · c6f86b4
1 parent 13df2e1
commit c6f86b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18f9f1365dad1237072d360bc487d8c7a1cae532
+refs/heads/master: 0b53ff2eadb1db6818894435f85989fb05d7e718
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -1236,8 +1236,11 @@ __sk_dst_set(struct sock *sk, struct dst_entry *dst)
 	struct dst_entry *old_dst;
 
 	sk_tx_queue_clear(sk);
-	old_dst = rcu_dereference_check(sk->sk_dst_cache,
-					lockdep_is_held(&sk->sk_dst_lock));
+	/*
+	 * This can be called while sk is owned by the caller only,
+	 * with no state that can be checked in a rcu_dereference_check() cond
+	 */
+	old_dst = rcu_dereference_raw(sk->sk_dst_cache);
 	rcu_assign_pointer(sk->sk_dst_cache, dst);
 	dst_release(old_dst);
 }