diff options
| author | Michal Hocko <mhocko@suse.cz> | 2011-07-08 14:39:41 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-08 22:21:58 +0200 |
| commit | d8bf4ca9ca9576548628344c9725edd3786e90b1 (patch) | |
| tree | df338f50a5af6bc3651bd863b79fa91e6b1e9e20 /include/net | |
| parent | eb032b9837a958e21ca000358a5bde5e17192ddb (diff) | |
| download | op-kernel-dev-d8bf4ca9ca9576548628344c9725edd3786e90b1.zip op-kernel-dev-d8bf4ca9ca9576548628344c9725edd3786e90b1.tar.gz | |
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Since ca5ecddf (rcu: define __rcu address space modifier for sparse)
rcu_dereference_check use rcu_read_lock_held as a part of condition
automatically so callers do not have to do that as well.
Signed-off-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index c0b938c..d5b65c1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1301,8 +1301,7 @@ extern unsigned long sock_i_ino(struct sock *sk); 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) || + return rcu_dereference_check(sk->sk_dst_cache, sock_owned_by_user(sk) || lockdep_is_held(&sk->sk_lock.slock)); } |
