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

Commit 6430a8de authored by Artem B. Bityuckiy's avatar Artem B. Bityuckiy Committed by Thomas Gleixner
Browse files

[JFFS2] Simplify the tree insert code. 



It isn't _normal_ that we allow key collision in rbtrees, 
but it does not matter as long as the two nodes with the same
version are together.

Signed-off-by: default avatarArtem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 265489f0

fs/jffs2/nodelist.c

+4 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: nodelist.c,v 1.95 2005/07/05 21:03:07 dwmw2 Exp $

 * $Id: nodelist.c,v 1.97 2005/07/06 15:18:41 dwmw2 Exp $

 *

 */
@@ -69,12 +69,11 @@ static void jffs2_add_tn_to_list(struct jffs2_tmp_dnode_info *tn, struct rb_root 
		parent = *p;

		this = rb_entry(parent, struct jffs2_tmp_dnode_info, rb);



		/* There may actually be a collision here, but it doesn't

		   actually matter. As long as the two nodes with the same

		   version are together, it's all fine. */

		if (tn->version < this->version)

			p = &(*p)->rb_left;

		else if (tn->version > this->version)

			p = &(*p)->rb_right;

		else if (tn < this)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

        }