From: Jan Kara <jack@suse.cz>
To: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
EXT4 <linux-ext4@vger.kernel.org>, Jan Kara <jack@suse.cz>,
rostedt@goodmis.org, Andreas Dilger <adilger.kernel@dilger.ca>,
"Theodore Ts'o" <tytso@mit.edu>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 07/11] fs/ext4: use rbtree postorder iteration helper instead of opencoding
Date: Thu, 7 Nov 2013 10:28:01 +0100 [thread overview]
Message-ID: <20131107092801.GB28464@quack.suse.cz> (raw)
In-Reply-To: <1383788572-25938-8-git-send-email-cody@linux.vnet.ibm.com>
On Wed 06-11-13 17:42:36, Cody P Schafer wrote:
> Use rbtree_postorder_for_each_entry_safe() to destroy the rbtree instead
> of opencoding an alternate postorder iteration that modifies the tree
The patch looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
> ---
> fs/ext4/block_validity.c | 33 ++++-----------------------------
> fs/ext4/dir.c | 35 +++++------------------------------
> 2 files changed, 9 insertions(+), 59 deletions(-)
>
> diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
> index 3f11656..41eb9dc 100644
> --- a/fs/ext4/block_validity.c
> +++ b/fs/ext4/block_validity.c
> @@ -180,37 +180,12 @@ int ext4_setup_system_zone(struct super_block *sb)
> /* Called when the filesystem is unmounted */
> void ext4_release_system_zone(struct super_block *sb)
> {
> - struct rb_node *n = EXT4_SB(sb)->system_blks.rb_node;
> - struct rb_node *parent;
> - struct ext4_system_zone *entry;
> + struct ext4_system_zone *entry, *n;
>
> - while (n) {
> - /* Do the node's children first */
> - if (n->rb_left) {
> - n = n->rb_left;
> - continue;
> - }
> - if (n->rb_right) {
> - n = n->rb_right;
> - continue;
> - }
> - /*
> - * The node has no children; free it, and then zero
> - * out parent's link to it. Finally go to the
> - * beginning of the loop and try to free the parent
> - * node.
> - */
> - parent = rb_parent(n);
> - entry = rb_entry(n, struct ext4_system_zone, node);
> + rbtree_postorder_for_each_entry_safe(entry, n,
> + &EXT4_SB(sb)->system_blks, node)
> kmem_cache_free(ext4_system_zone_cachep, entry);
> - if (!parent)
> - EXT4_SB(sb)->system_blks = RB_ROOT;
> - else if (parent->rb_left == n)
> - parent->rb_left = NULL;
> - else if (parent->rb_right == n)
> - parent->rb_right = NULL;
> - n = parent;
> - }
> +
> EXT4_SB(sb)->system_blks = RB_ROOT;
> }
>
> diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
> index 680bb33..d638c57 100644
> --- a/fs/ext4/dir.c
> +++ b/fs/ext4/dir.c
> @@ -353,41 +353,16 @@ struct fname {
> */
> static void free_rb_tree_fname(struct rb_root *root)
> {
> - struct rb_node *n = root->rb_node;
> - struct rb_node *parent;
> - struct fname *fname;
> -
> - while (n) {
> - /* Do the node's children first */
> - if (n->rb_left) {
> - n = n->rb_left;
> - continue;
> - }
> - if (n->rb_right) {
> - n = n->rb_right;
> - continue;
> - }
> - /*
> - * The node has no children; free it, and then zero
> - * out parent's link to it. Finally go to the
> - * beginning of the loop and try to free the parent
> - * node.
> - */
> - parent = rb_parent(n);
> - fname = rb_entry(n, struct fname, rb_hash);
> + struct fname *fname, *next;
> +
> + rbtree_postorder_for_each_entry_safe(fname, next, root, rb_hash)
> while (fname) {
> struct fname *old = fname;
> fname = fname->next;
> kfree(old);
> }
> - if (!parent)
> - *root = RB_ROOT;
> - else if (parent->rb_left == n)
> - parent->rb_left = NULL;
> - else if (parent->rb_right == n)
> - parent->rb_right = NULL;
> - n = parent;
> - }
> +
> + *root = RB_ROOT;
> }
>
>
> --
> 1.8.4.2
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next prev parent reply other threads:[~2013-11-07 9:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 1:42 [PATCH v2 00/11] rbtree: postorder iteration: fix, add tests, and use in various places Cody P Schafer
2013-11-07 1:42 ` [PATCH v2 01/11] rbtree: Fix rbtree_postorder_for_each_entry_safe() iterator Cody P Schafer
2013-11-07 11:51 ` Michel Lespinasse
2013-11-07 18:59 ` Cody P Schafer
2013-11-07 21:38 ` Andrew Morton
2013-11-07 21:58 ` Cody P Schafer
2013-11-07 22:14 ` Jan Kara
2013-11-07 1:42 ` [PATCH v2 02/11] rbtree/test: move rb_node to the middle of the test struct Cody P Schafer
2013-11-07 11:52 ` Michel Lespinasse
2013-11-07 1:42 ` [PATCH v2 03/11] rbtree/test: test rbtree_postorder_for_each_entry_safe() Cody P Schafer
2013-11-07 11:54 ` Michel Lespinasse
2013-11-07 1:42 ` [PATCH v2 04/11] net ipset: use rbtree postorder iteration instead of opencoding Cody P Schafer
2013-11-07 1:42 ` [PATCH v2 05/11] trace/trace_stat: use rbtree postorder iteration helper " Cody P Schafer
2013-11-07 1:42 ` [PATCH v2 06/11] fs/ubifs: " Cody P Schafer
2013-11-07 1:42 ` [PATCH v2 07/11] fs/ext4: " Cody P Schafer
2013-11-07 9:28 ` Jan Kara [this message]
2013-11-07 1:42 ` [PATCH v2 08/11] fs/jffs2: " Cody P Schafer
2013-11-07 1:42 ` [PATCH v2 09/11] fs/ext3: " Cody P Schafer
2013-11-07 8:17 ` Jan Kara
2013-11-07 1:42 ` [PATCH v2 10/11] mtd/ubi: " Cody P Schafer
2013-11-07 1:42 ` [PATCH v2 11/11] sh/dwarf: use rbtree postorder iteration helper instead of solution using repeated rb_erase() Cody P Schafer
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=20131107092801.GB28464@quack.suse.cz \
--to=jack@suse.cz \
--cc=adilger.kernel@dilger.ca \
--cc=akpm@linux-foundation.org \
--cc=cody@linux.vnet.ibm.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tytso@mit.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).