diff options
author | Matthew Wilcox <willy@linux.intel.com> | 2016-05-20 20:02:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 20:58:30 -0400 |
commit | 29e0967c2f66771f654cef7168c90a53737abcdf (patch) | |
tree | 95e021c42ea084842b033b590d9843fb08efb4eb /lib | |
parent | 3b8c00f68405e9c037a6d8ae0d5d9da7f8a34e6a (diff) |
radix-tree: fix deleting a multi-order entry through an alias
If we deleted an entry through an index which looked up a sibling
pointer, we'd end up zeroing out the wrong slots in the node. Use
get_slot_offset() to find the right slot.
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Reviewed-by: Ross Zwisler <ross.zwisler@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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/radix-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index c0366d1d2613..b3364b9ecc83 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
@@ -1558,7 +1558,7 @@ void *radix_tree_delete_item(struct radix_tree_root *root, | |||
1558 | return entry; | 1558 | return entry; |
1559 | } | 1559 | } |
1560 | 1560 | ||
1561 | offset = index & RADIX_TREE_MAP_MASK; | 1561 | offset = get_slot_offset(node, slot); |
1562 | 1562 | ||
1563 | /* | 1563 | /* |
1564 | * Clear all tags associated with the item to be deleted. | 1564 | * Clear all tags associated with the item to be deleted. |