summaryrefslogtreecommitdiffstats
path: root/include/linux/rculist_bl.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2013-02-14 16:42:34 -0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-03-12 14:07:41 -0700
commit49d0de082c31de34cc896c14eec5f1c2ade0415a (patch)
tree29a1b907aa45ef5c158fbba3a820067a9b8e568e /include/linux/rculist_bl.h
parent6f0a6ad2b55053879eee89f812f3527950c380d6 (diff)
downloadlinux-49d0de082c31de34cc896c14eec5f1c2ade0415a.tar.gz
linux-49d0de082c31de34cc896c14eec5f1c2ade0415a.tar.bz2
linux-49d0de082c31de34cc896c14eec5f1c2ade0415a.zip
rcu: Fix hlist_bl_set_first_rcu() annotation
Abhi noticed that we were getting a complaint from the RCU subsystem about access of an RCU protected list under the write side bit lock. This commit adds additional annotation to check both the RCU read lock and the write side bit lock before printing a message. Reported by: Abhijith Das <adas@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Tested-by: Abhijith Das <adas@redhat.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'include/linux/rculist_bl.h')
-rw-r--r--include/linux/rculist_bl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rculist_bl.h b/include/linux/rculist_bl.h
index cf1244fbf3b6..4f216c59e7db 100644
--- a/include/linux/rculist_bl.h
+++ b/include/linux/rculist_bl.h
@@ -20,7 +20,7 @@ static inline void hlist_bl_set_first_rcu(struct hlist_bl_head *h,
static inline struct hlist_bl_node *hlist_bl_first_rcu(struct hlist_bl_head *h)
{
return (struct hlist_bl_node *)
- ((unsigned long)rcu_dereference(h->first) & ~LIST_BL_LOCKMASK);
+ ((unsigned long)rcu_dereference_check(h->first, hlist_bl_is_locked(h)) & ~LIST_BL_LOCKMASK);
}
/**