From: NeilBrown <neilb@suse.de>
To: Andrew Morton <akpm@osdl.org>
Cc: Nick Piggin <npiggin@suse.de>, linux-kernel@vger.kernel.org
Subject: [PATCH] Fix over-zealous tag clearing in radix_tree_delete
Date: Thu, 16 Feb 2006 14:43:01 +1100 [thread overview]
Message-ID: <1060216034301.11136@suse.de> (raw)
In-Reply-To: 20060216144112.11116.patches@notabene
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.
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Neil Brown <neilb@suse.de>
### Diffstat output
./lib/radix-tree.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff ./lib/radix-tree.c~current~ ./lib/radix-tree.c
--- ./lib/radix-tree.c~current~ 2006-02-16 13:22:28.000000000 +1100
+++ ./lib/radix-tree.c 2006-02-16 14:31:21.000000000 +1100
@@ -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--) {
next parent reply other threads:[~2006-02-16 3:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060216144112.11116.patches@notabene>
2006-02-16 3:43 ` NeilBrown [this message]
2006-02-16 6:05 ` [PATCH] Fix over-zealous tag clearing in radix_tree_delete Nick Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1060216034301.11136@suse.de \
--to=neilb@suse.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=npiggin@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.