4 files changed, 1 insertions, 5 deletions

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index ab4ac0ccb857..da7e4bc34e8c 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -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))
 
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 82607992f308..f240f2fa0197 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -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));               \
         })
 
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 133c0ba25e30..df7e3cf82e97 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -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()))
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index bbad657a3725..27576aa05e8c 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -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