Commit a49a4af7 authored Sep 29, 2006 by Josh Triplett Committed by Linus Torvalds Sep 29, 2006

[PATCH] rcu: add lock annotations to rcu{,_bh}_torture_read_{lock,unlock}

rcu_torture_read_lock and rcu_bh_torture_read_lock acquire locks without
releasing them, and the matching functions rcu_torture_read_unlock and
rcu_bh_torture_read_unlock get called with the corresponding locks held and
release them. Add lock annotations to these four functions so that sparse
can check callers for lock pairing, and so that sparse will not complain
about these functions since they intentionally use locks in this manner.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 9c4dbee7

kernel/rcutorture.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -192,13 +192,13 @@ static struct rcu_torture_ops *cur_ops = NULL;
		* Definitions for rcu torture testing.
		*/

		static int rcu_torture_read_lock(void)
		static int rcu_torture_read_lock(void) __acquires(RCU)
		{
		rcu_read_lock();
		return 0;
		}

		static void rcu_torture_read_unlock(int idx)
		static void rcu_torture_read_unlock(int idx) __releases(RCU)
		{
		rcu_read_unlock();
		}
		@@ -250,13 +250,13 @@ static struct rcu_torture_ops rcu_ops = {
		* Definitions for rcu_bh torture testing.
		*/

		static int rcu_bh_torture_read_lock(void)
		static int rcu_bh_torture_read_lock(void) __acquires(RCU_BH)
		{
		rcu_read_lock_bh();
		return 0;
		}

		static void rcu_bh_torture_read_unlock(int idx)
		static void rcu_bh_torture_read_unlock(int idx) __releases(RCU_BH)
		{
		rcu_read_unlock_bh();
		}

Admin message