aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorArtem B. Bityuckiy <dedekind@infradead.org>2005-07-06 15:43:18 +0100
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-07-06 18:30:00 +0200
commit6430a8def12edebc1c9c7c2621d33ca0e8653c33 (patch)
treed3c12091e821b7a98da9a58d9d11f648699d207c /fs
parent265489f01d8c05f7aae174651a98854af090efc0 (diff)
downloadmrst-s0i3-test-6430a8def12edebc1c9c7c2621d33ca0e8653c33.tar.gz
mrst-s0i3-test-6430a8def12edebc1c9c7c2621d33ca0e8653c33.tar.xz
mrst-s0i3-test-6430a8def12edebc1c9c7c2621d33ca0e8653c33.zip
[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: Artem B. Bityuckiy <dedekind@infradead.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/nodelist.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index be38cc5c35c..c7bbdeec93a 100644
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -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;
}