From dc8ce7fd155ba84465d5854b1efc1639d9b1db26 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Fri, 20 Oct 2006 14:41:05 -0700 Subject: [PATCH] --- yaml --- r: 45621 b: refs/heads/master c: ea7415cca922389b4f3c0cf75e0af9fbf827880e h: refs/heads/master i: 45619: 8d1ebb882b797d6545739b93c99e4e37333a9137 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/nodelist.h | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 45a1135e3bc6..cc44eacc58e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29175778b07aa60e7f8030bd95d69f70070cc1f7 +refs/heads/master: ea7415cca922389b4f3c0cf75e0af9fbf827880e diff --git a/trunk/fs/jffs2/nodelist.h b/trunk/fs/jffs2/nodelist.h index 0ddfd70307fb..4178b4b55948 100644 --- a/trunk/fs/jffs2/nodelist.h +++ b/trunk/fs/jffs2/nodelist.h @@ -294,23 +294,21 @@ static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev) static inline struct jffs2_node_frag *frag_first(struct rb_root *root) { - struct rb_node *node = root->rb_node; + struct rb_node *node = rb_first(root); if (!node) return NULL; - while(node->rb_left) - node = node->rb_left; + return rb_entry(node, struct jffs2_node_frag, rb); } static inline struct jffs2_node_frag *frag_last(struct rb_root *root) { - struct rb_node *node = root->rb_node; + struct rb_node *node = rb_last(root); if (!node) return NULL; - while(node->rb_right) - node = node->rb_right; + return rb_entry(node, struct jffs2_node_frag, rb); }