From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753845Ab3KDO0n (ORCPT ); Mon, 4 Nov 2013 09:26:43 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51448 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752799Ab3KDO0l (ORCPT ); Mon, 4 Nov 2013 09:26:41 -0500 Date: Mon, 4 Nov 2013 15:26:38 +0100 From: Jan Kara To: Cody P Schafer Cc: Andreas Dilger , Andrew Morton , Jan Kara , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 6/8] fs/ext3: use rbtree postorder iteration helper instead of opencoding Message-ID: <20131104142638.GD8566@quack.suse.cz> References: <1383345566-25087-1-git-send-email-cody@linux.vnet.ibm.com> <1383345566-25087-6-git-send-email-cody@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1383345566-25087-6-git-send-email-cody@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 01-11-13 15:38:50, 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 Thanks. I've merged the patch into my tree. Honza > Signed-off-by: Cody P Schafer > --- > fs/ext3/dir.c | 36 +++++------------------------------- > 1 file changed, 5 insertions(+), 31 deletions(-) > > diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c > index bafdd48..a331ad1 100644 > --- a/fs/ext3/dir.c > +++ b/fs/ext3/dir.c > @@ -309,43 +309,17 @@ 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; > +} > > static struct dir_private_info *ext3_htree_create_dir_info(struct file *filp, > loff_t pos) > -- > 1.8.4.2 > -- Jan Kara SUSE Labs, CR