]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drivers/hwspinlock: use correct radix tree API
authorMatthew Wilcox <willy@linux.intel.com>
Sat, 21 May 2016 00:03:01 +0000 (17:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 May 2016 00:58:30 +0000 (17:58 -0700)
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: 4fca49afcfb4 ("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>
drivers/hwspinlock/hwspinlock_core.c

index d50c701b19d678e9998319be36a492bb3a8eba6d..4074441444fed29128574a1f0a5c1143de857cd7 100644 (file)
@@ -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;
                }