From: Cody P Schafer <cody@linux.vnet.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>,
EXT4 <linux-ext4@vger.kernel.org>, Jan Kara <jack@suse.cz>,
rostedt@goodmis.org, Artem Bityutskiy <dedekind1@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Cody P Schafer <cody@linux.vnet.ibm.com>,
David Woodhouse <dwmw2@infradead.org>,
linux-mtd@lists.infradead.org
Subject: [PATCH v2 10/11] mtd/ubi: use rbtree postorder iteration helper instead of opencoding
Date: Wed, 6 Nov 2013 17:42:39 -0800 [thread overview]
Message-ID: <1383788572-25938-11-git-send-email-cody@linux.vnet.ibm.com> (raw)
In-Reply-To: <1383788572-25938-1-git-send-email-cody@linux.vnet.ibm.com>
Use rbtree_postorder_for_each_entry_safe() to destroy the rbtree instead
of opencoding an alternate postorder iteration that modifies the tree
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
---
drivers/mtd/ubi/attach.c | 49 +++++++-----------------------------------------
drivers/mtd/ubi/wl.c | 25 +++---------------------
2 files changed, 10 insertions(+), 64 deletions(-)
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index c071d41..6de0786 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -1133,27 +1133,11 @@ static int late_analysis(struct ubi_device *ubi, struct ubi_attach_info *ai)
*/
static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
{
- struct ubi_ainf_peb *aeb;
- struct rb_node *this = av->root.rb_node;
-
- while (this) {
- if (this->rb_left)
- this = this->rb_left;
- else if (this->rb_right)
- this = this->rb_right;
- else {
- aeb = rb_entry(this, struct ubi_ainf_peb, u.rb);
- this = rb_parent(this);
- if (this) {
- if (this->rb_left == &aeb->u.rb)
- this->rb_left = NULL;
- else
- this->rb_right = NULL;
- }
+ struct ubi_ainf_peb *aeb, *next;
+
+ rbtree_postorder_for_each_entry_safe(aeb, next, &av->root, u.rb)
+ kmem_cache_free(ai->aeb_slab_cache, aeb);
- kmem_cache_free(ai->aeb_slab_cache, aeb);
- }
- }
kfree(av);
}
@@ -1164,8 +1148,7 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
static void destroy_ai(struct ubi_attach_info *ai)
{
struct ubi_ainf_peb *aeb, *aeb_tmp;
- struct ubi_ainf_volume *av;
- struct rb_node *rb;
+ struct ubi_ainf_volume *av, *next;
list_for_each_entry_safe(aeb, aeb_tmp, &ai->alien, u.list) {
list_del(&aeb->u.list);
@@ -1185,26 +1168,8 @@ static void destroy_ai(struct ubi_attach_info *ai)
}
/* Destroy the volume RB-tree */
- rb = ai->volumes.rb_node;
- while (rb) {
- if (rb->rb_left)
- rb = rb->rb_left;
- else if (rb->rb_right)
- rb = rb->rb_right;
- else {
- av = rb_entry(rb, struct ubi_ainf_volume, rb);
-
- rb = rb_parent(rb);
- if (rb) {
- if (rb->rb_left == &av->rb)
- rb->rb_left = NULL;
- else
- rb->rb_right = NULL;
- }
-
- destroy_av(ai, av);
- }
- }
+ rbtree_postorder_for_each_entry_safe(av, next, &ai->volumes, rb)
+ destroy_av(ai, av);
if (ai->aeb_slab_cache)
kmem_cache_destroy(ai->aeb_slab_cache);
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index c95bfb1..1af3899 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1760,29 +1760,10 @@ int ubi_wl_flush(struct ubi_device *ubi, int vol_id, int lnum)
*/
static void tree_destroy(struct rb_root *root)
{
- struct rb_node *rb;
- struct ubi_wl_entry *e;
-
- rb = root->rb_node;
- while (rb) {
- if (rb->rb_left)
- rb = rb->rb_left;
- else if (rb->rb_right)
- rb = rb->rb_right;
- else {
- e = rb_entry(rb, struct ubi_wl_entry, u.rb);
-
- rb = rb_parent(rb);
- if (rb) {
- if (rb->rb_left == &e->u.rb)
- rb->rb_left = NULL;
- else
- rb->rb_right = NULL;
- }
+ struct ubi_wl_entry *e, *next;
- kmem_cache_free(ubi_wl_entry_slab, e);
- }
- }
+ rbtree_postorder_for_each_entry_safe(e, next, root, u.rb)
+ kmem_cache_free(ubi_wl_entry_slab, e);
}
/**
--
1.8.4.2
next prev parent reply other threads:[~2013-11-07 1:46 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
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 ` Cody P Schafer [this message]
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=1383788572-25938-11-git-send-email-cody@linux.vnet.ibm.com \
--to=cody@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=rostedt@goodmis.org \
/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).