Commit b76ba4af authored May 20, 2016 by Matthew Wilcox Committed by Linus Torvalds May 20, 2016

drivers/hwspinlock: use correct radix tree API



radix_tree_is_indirect_ptr() is an internal API.  The correct call to
use is radix_tree_deref_retry() which has the appropriate unlikely()
annotation.

Fixes: c6400ba7 ("drivers/hwspinlock: fix race between radix tree insertion and lookup")
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Jan Kara <jack@suse.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6b053b8e

drivers/hwspinlock/hwspinlock_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ int of_hwspin_lock_get_id(struct device_node *np, int index)
		hwlock = radix_tree_deref_slot(slot);
		if (unlikely(!hwlock))
		continue;
		if (radix_tree_is_indirect_ptr(hwlock)) {
		if (radix_tree_deref_retry(hwlock)) {
		slot = radix_tree_iter_retry(&iter);
		continue;
		}

Admin message