From c6f86b4363db16a9d91a506d59e8a7c36215b6ae Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 26 Apr 2010 20:40:43 +0000 Subject: [PATCH] --- yaml --- r: 194541 b: refs/heads/master c: 0b53ff2eadb1db6818894435f85989fb05d7e718 h: refs/heads/master i: 194539: 0a3374ad36a7f217089e0a090645d02061860a36 v: v3 --- [refs] | 2 +- trunk/include/net/sock.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index df920c37f300..b7541e5afb15 100644 --- 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 index 86a8ca177a29..4081db86a352 100644 --- 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); }