diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-10-20 17:41:05 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:21:40 -0400 |
commit | ea7415cca922389b4f3c0cf75e0af9fbf827880e (patch) | |
tree | 0dffbaa5e92b3bf4d0e48f5b6b6e37ca31bc3a01 /fs/jffs2/nodelist.h | |
parent | 29175778b07aa60e7f8030bd95d69f70070cc1f7 (diff) |
[JFFS2] Use rb_first() and rb_last() cleanup
Use rb_first() and rb_last() to implement frag_first() and frag_last().
Signed-off-by: Akinbou Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/nodelist.h')
-rw-r--r-- | fs/jffs2/nodelist.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h index 0ddfd70307fb..4178b4b55948 100644 --- a/fs/jffs2/nodelist.h +++ b/fs/jffs2/nodelist.h | |||
@@ -294,23 +294,21 @@ static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev) | |||
294 | 294 | ||
295 | static inline struct jffs2_node_frag *frag_first(struct rb_root *root) | 295 | static inline struct jffs2_node_frag *frag_first(struct rb_root *root) |
296 | { | 296 | { |
297 | struct rb_node *node = root->rb_node; | 297 | struct rb_node *node = rb_first(root); |
298 | 298 | ||
299 | if (!node) | 299 | if (!node) |
300 | return NULL; | 300 | return NULL; |
301 | while(node->rb_left) | 301 | |
302 | node = node->rb_left; | ||
303 | return rb_entry(node, struct jffs2_node_frag, rb); | 302 | return rb_entry(node, struct jffs2_node_frag, rb); |
304 | } | 303 | } |
305 | 304 | ||
306 | static inline struct jffs2_node_frag *frag_last(struct rb_root *root) | 305 | static inline struct jffs2_node_frag *frag_last(struct rb_root *root) |
307 | { | 306 | { |
308 | struct rb_node *node = root->rb_node; | 307 | struct rb_node *node = rb_last(root); |
309 | 308 | ||
310 | if (!node) | 309 | if (!node) |
311 | return NULL; | 310 | return NULL; |
312 | while(node->rb_right) | 311 | |
313 | node = node->rb_right; | ||
314 | return rb_entry(node, struct jffs2_node_frag, rb); | 312 | return rb_entry(node, struct jffs2_node_frag, rb); |
315 | } | 313 | } |
316 | 314 | ||