rcu: move check from rcu_dereference_bh to rcu_read_lock_bh_held

paulmck · paulmck · commit 773e3f93577f · 2010-10-05T14:03:02.000-07:00
As suggested by Linus, push the irqs_disabled() down to the
rcu_read_lock_bh_held() level so that all callers get the benefit
of the correct check.

Signed-off-by: Paul E. McKenney &lt;paulmck@linux.vnet.ibm.com&gt;
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
@@ -454,7 +454,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
  * Makes rcu_dereference_check() do the dirty work.
  */
 #define rcu_dereference_bh(p) \
-		rcu_dereference_check(p, rcu_read_lock_bh_held() || irqs_disabled())
+		rcu_dereference_check(p, rcu_read_lock_bh_held())
 
 /**
  * rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
@@ -86,7 +86,7 @@ int rcu_read_lock_bh_held(void)
 {
 	if (!debug_lockdep_rcu_enabled())
 		return 1;
-	return in_softirq();
+	return in_softirq() || irqs_disabled();
 }
 EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ int rcu_read_lock_bh_held(void)`
`86`	`86`	`{`
`87`	`87`	`if (!debug_lockdep_rcu_enabled())`
`88`	`88`	`return 1;`
`89`		`- return in_softirq();`
	`89`	`+ return in_softirq() \|\| irqs_disabled();`
`90`	`90`	`}`
`91`	`91`	`EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);`
`92`	`92`