Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb25e49f authored by Cody P Schafer's avatar Cody P Schafer Committed by Linus Torvalds
Browse files

fs/ubifs: use rbtree postorder iteration helper instead of opencoding 



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: default avatarCody P Schafer <cody@linux.vnet.ibm.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b182837a

fs/ubifs/debug.c

+3 −19
Original line number Diff line number Diff line
@@ -2118,27 +2118,11 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr, 
 */

static void free_inodes(struct fsck_data *fsckd)

{

	struct rb_node *this = fsckd->inodes.rb_node;

	struct fsck_inode *fscki;

	struct fsck_inode *fscki, *n;



	while (this) {

		if (this->rb_left)

			this = this->rb_left;

		else if (this->rb_right)

			this = this->rb_right;

		else {

			fscki = rb_entry(this, struct fsck_inode, rb);

			this = rb_parent(this);

			if (this) {

				if (this->rb_left == &fscki->rb)

					this->rb_left = NULL;

				else

					this->rb_right = NULL;

			}

	rbtree_postorder_for_each_entry_safe(fscki, n, &fsckd->inodes, rb)

		kfree(fscki);

}

	}

}



/**

 * check_inodes - checks all inodes.

fs/ubifs/log.c

+2 −19
Original line number Diff line number Diff line
@@ -574,28 +574,11 @@ static int done_already(struct rb_root *done_tree, int lnum) 
 */

static void destroy_done_tree(struct rb_root *done_tree)

{

	struct rb_node *this = done_tree->rb_node;

	struct done_ref *dr;

	struct done_ref *dr, *n;



	while (this) {

		if (this->rb_left) {

			this = this->rb_left;

			continue;

		} else if (this->rb_right) {

			this = this->rb_right;

			continue;

		}

		dr = rb_entry(this, struct done_ref, rb);

		this = rb_parent(this);

		if (this) {

			if (this->rb_left == &dr->rb)

				this->rb_left = NULL;

			else

				this->rb_right = NULL;

		}

	rbtree_postorder_for_each_entry_safe(dr, n, done_tree, rb)

		kfree(dr);

}

}



/**

 * add_node - add a node to the consolidated log.

fs/ubifs/orphan.c

+2 −19
Original line number Diff line number Diff line
@@ -815,28 +815,11 @@ static int dbg_find_check_orphan(struct rb_root *root, ino_t inum) 


static void dbg_free_check_tree(struct rb_root *root)

{

	struct rb_node *this = root->rb_node;

	struct check_orphan *o;

	struct check_orphan *o, *n;



	while (this) {

		if (this->rb_left) {

			this = this->rb_left;

			continue;

		} else if (this->rb_right) {

			this = this->rb_right;

			continue;

		}

		o = rb_entry(this, struct check_orphan, rb);

		this = rb_parent(this);

		if (this) {

			if (this->rb_left == &o->rb)

				this->rb_left = NULL;

			else

				this->rb_right = NULL;

		}

	rbtree_postorder_for_each_entry_safe(o, n, root, rb)

		kfree(o);

}

}



static int dbg_orphan_check(struct ubifs_info *c, struct ubifs_zbranch *zbr,

			    void *priv)

fs/ubifs/recovery.c

+3 −18
Original line number Diff line number Diff line
@@ -1335,29 +1335,14 @@ static void remove_ino(struct ubifs_info *c, ino_t inum) 
 */

void ubifs_destroy_size_tree(struct ubifs_info *c)

{

	struct rb_node *this = c->size_tree.rb_node;

	struct size_entry *e;

	struct size_entry *e, *n;



	while (this) {

		if (this->rb_left) {

			this = this->rb_left;

			continue;

		} else if (this->rb_right) {

			this = this->rb_right;

			continue;

		}

		e = rb_entry(this, struct size_entry, rb);

	rbtree_postorder_for_each_entry_safe(e, n, &c->size_tree, rb) {

		if (e->inode)

			iput(e->inode);

		this = rb_parent(this);

		if (this) {

			if (this->rb_left == &e->rb)

				this->rb_left = NULL;

			else

				this->rb_right = NULL;

		}

		kfree(e);

	}



	c->size_tree = RB_ROOT;

}

fs/ubifs/super.c

+4 −20
Original line number Diff line number Diff line
@@ -873,27 +873,11 @@ static void free_orphans(struct ubifs_info *c) 
 */

static void free_buds(struct ubifs_info *c)

{

	struct rb_node *this = c->buds.rb_node;

	struct ubifs_bud *bud;

	struct ubifs_bud *bud, *n;



	while (this) {

		if (this->rb_left)

			this = this->rb_left;

		else if (this->rb_right)

			this = this->rb_right;

		else {

			bud = rb_entry(this, struct ubifs_bud, rb);

			this = rb_parent(this);

			if (this) {

				if (this->rb_left == &bud->rb)

					this->rb_left = NULL;

				else

					this->rb_right = NULL;

			}

	rbtree_postorder_for_each_entry_safe(bud, n, &c->buds, rb)

		kfree(bud);

}

	}

}



/**

 * check_volume_empty - check if the UBI volume is empty.