Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index c0bd4a914803..1e5b17dc7e3d 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -752,12 +752,14 @@ void *radix_tree_delete(struct radix_tree_root *root, unsigned long index)
          */
         nr_cleared_tags = 0;
         for (tag = 0; tag < RADIX_TREE_TAGS; tag++) {
+                tags[tag] = 1;
                 if (tag_get(pathp->node, tag, pathp->offset)) {
                         tag_clear(pathp->node, tag, pathp->offset);
-                        tags[tag] = 0;
-                        nr_cleared_tags++;
-                } else
-                        tags[tag] = 1;
+                        if (!any_tag_set(pathp->node, tag)) {
+                                tags[tag] = 0;
+                                nr_cleared_tags++;
+                        }
+                }
         }
 
         for (pathp--; nr_cleared_tags && pathp->node; pathp--) {