Skip to content

Commit

Permalink
[JFFS2] Simplify the tree insert code.
Browse files Browse the repository at this point in the history
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: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Artem B. Bityuckiy authored and Thomas Gleixner committed Jul 6, 2005
1 parent 265489f commit 6430a8d
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fs/jffs2/nodelist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 $
*
*/

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6430a8d

Please sign in to comment.