Commit e65b9ad2 authored Jan 15, 2013 by Jiri Kosina Committed by Linus Torvalds Jan 16, 2013

lockdep, rwsem: fix down_write_nest_lock() if !CONFIG_DEBUG_LOCK_ALLOC



Commit 1b963c81 ("lockdep, rwsem: provide down_write_nest_lock()")
contains a bug in a codepath when CONFIG_DEBUG_LOCK_ALLOC is disabled,
which causes down_read() to be called instead of down_write() by mistake
on such configurations.  Fix that.

Reported-and-tested-by: Andrew Clayton <andrew@digital-domain.net>
Reported-and-tested-by: Zlatko Calusic <zlatko.calusic@iskon.hr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Reviewed-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 36e7a96c

include/linux/rwsem.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ do { \

		#else
		# define down_read_nested(sem, subclass) down_read(sem)
		# define down_write_nest_lock(sem, nest_lock) down_read(sem)
		# define down_write_nest_lock(sem, nest_lock) down_write(sem)
		# define down_write_nested(sem, subclass) down_write(sem)
		#endif

Admin message