From defd2260a71ee9ae8c3dd32b52a80f809602616c Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Mon, 31 Oct 2011 17:07:02 -0700
Subject: [PATCH] --- yaml --- r: 272112 b: refs/heads/master c:
 3fa36acbced23c563345de3179dfe1775f15be5e h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/lib/radix-tree.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0312ea214a17..fb5206044acb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dabec93de633a87adfbbe1d800a4c56cd19d73b
+refs/heads/master: 3fa36acbced23c563345de3179dfe1775f15be5e
diff --git a/trunk/lib/radix-tree.c b/trunk/lib/radix-tree.c
index a2f9da59c197..d9df7454519c 100644
--- a/trunk/lib/radix-tree.c
+++ b/trunk/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--;