Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8bf4ca9 authored by Michal Hocko's avatar Michal Hocko Committed by Jiri Kosina
Browse files

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: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent eb032b98

include/linux/cgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ static inline struct cgroup_subsys_state *cgroup_subsys_state( 
 */

#define task_subsys_state_check(task, subsys_id, __c)			\

	rcu_dereference_check(task->cgroups->subsys[subsys_id],		\

			      rcu_read_lock_held() ||			\

			      lockdep_is_held(&task->alloc_lock) ||	\

			      cgroup_lock_is_held() || (__c))

include/linux/cred.h

+0 −1
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ static inline void put_cred(const struct cred *_cred) 
	({								\

		const struct task_struct *__t = (task);			\

		rcu_dereference_check(__t->real_cred,			\

				      rcu_read_lock_held() ||		\

				      task_is_dead(__t));		\

	})

include/linux/fdtable.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct files_struct { 


#define rcu_dereference_check_fdtable(files, fdtfd) \

	(rcu_dereference_check((fdtfd), \

			       rcu_read_lock_held() || \

			       lockdep_is_held(&(files)->file_lock) || \

			       atomic_read(&(files)->count) == 1 || \

			       rcu_my_thread_group_empty()))

include/linux/rtnetlink.h

+1 −2
Original line number Diff line number Diff line
@@ -758,8 +758,7 @@ extern int lockdep_rtnl_is_held(void); 
 * or RTNL. Note : Please prefer rtnl_dereference() or rcu_dereference()

 */

#define rcu_dereference_rtnl(p)					\

	rcu_dereference_check(p, rcu_read_lock_held() ||	\

				 lockdep_rtnl_is_held())

	rcu_dereference_check(p, lockdep_rtnl_is_held())



/**

 * rtnl_dereference - fetch RCU pointer when updates are prevented by RTNL

include/net/sock.h

+1 −2
Original line number Diff line number Diff line
@@ -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));

}