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>

1 files changed, 1 insertions, 2 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index c0b938cb4b1a..d5b65c19a8e3 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));
 }