Skip to contentSkip to conversation

Fix over-zealous tag clearing in radix_tree_delete

PATCH In review NeilBrown 2 participants 2 messages Feb 16, 2006 1 message not in the archive Library code

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20060216144112.11116.patches@notabene

NeilBrown

author
#1 lore raw

PATCH 1/1 Fix over-zealous tag clearing in radix_tree_delete

Against 2.6.16-rc2-mm1. For inclusion in 2.6.16 please.

### Comments for Changeset

If a tag is set for a node being deleted from a radix_tree, then that tag gets cleared from the parent of the node, even if it is set for some siblings of the node begin deleted.

This patch changes the logic to include a test for any_tag_set similar to the logic a little futher down. Care is taken to ensure that 'nr_cleared_tags' remains equals to the number of entries in the 'tags' array which are set to '0' (which means that this tag is not set in the tree below pathp->node, and should be cleared at pathp->node and possibly above.

### Diffstat output

 ./lib/radix-tree.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
lib/radix-tree.c renamed from lib/radix-tree.c~current~ +6 -4
diff ./lib/radix-tree.c~current~ ./lib/radix-tree.c
@@ -753,12 +753,14 @@ void *radix_tree_delete(struct radix_tre
 	 */
 	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--) {
#2 lore raw
Quoted 15 lines · NeilBrown

Against 2.6.16-rc2-mm1. For inclusion in 2.6.16 please.

### Comments for Changeset

If a tag is set for a node being deleted from a radix_tree, then that tag gets cleared from the parent of the node, even if it is set for some siblings of the node begin deleted.

This patch changes the logic to include a test for any_tag_set similar to the logic a little futher down. Care is taken to ensure that 'nr_cleared_tags' remains equals to the number of entries in the 'tags' array which are set to '0' (which means that this tag is not set in the tree below pathp->node, and should be cleared at pathp->node and possibly above.

Quoted 3 lines

Linus FYI, I was able to modify the radix tree test harness to catch the bug and can no longer trigger it after the fix. Resulting code passes all other harness tests as well of course.

Should be applied ASAP. However, unlike Andrew I don't think this is a filesystem corrupting bug (maybe he was talking about NFS?).

Signature · 2 lines
SUSE Labs, Novell Inc.
Send instant messages to your online friends http://au.messenger.yahoo.com