diff options
| author | Hugh Dickins <hughd@google.com> | 2011-10-31 17:07:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 17:30:45 -0700 |
| commit | 3fa36acbced23c563345de3179dfe1775f15be5e (patch) | |
| tree | 83ad10f4dda426ee3708bc67c9fc88b6c1c8cc34 /lib/radix-tree.c | |
| parent | 0dabec93de633a87adfbbe1d800a4c56cd19d73b (diff) | |
| download | linux-stable-3fa36acbced23c563345de3179dfe1775f15be5e.tar.gz linux-stable-3fa36acbced23c563345de3179dfe1775f15be5e.tar.bz2 linux-stable-3fa36acbced23c563345de3179dfe1775f15be5e.zip | |
radix_tree: clean away saw_unset_tag leftovers
radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
unsafe and removed in 2.6.34, but the pointless saw_unset_tag left behind.
Remove it now, and return 0 as soon as we see unset tag - we already rely
upon the root tag to be correct, returning 0 immediately if it's not set.
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/radix-tree.c')
| -rw-r--r-- | lib/radix-tree.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index a2f9da59c197..d9df7454519c 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -576,7 +576,6 @@ int radix_tree_tag_get(struct radix_tree_root *root, { unsigned int height, shift; struct radix_tree_node *node; - int saw_unset_tag = 0; /* check the root's tag bit */ if (!root_tag_get(root, tag)) @@ -603,15 +602,10 @@ int radix_tree_tag_get(struct radix_tree_root *root, return 0; offset = (index >> shift) & RADIX_TREE_MAP_MASK; - - /* - * This is just a debug check. Later, we can bale as soon as - * we see an unset tag. - */ if (!tag_get(node, tag, offset)) - saw_unset_tag = 1; + return 0; if (height == 1) - return !!tag_get(node, tag, offset); + return 1; node = rcu_dereference_raw(node->slots[offset]); shift -= RADIX_TREE_MAP_SHIFT; height--; |