f2fs: use rb_entry_safe

Use rb_entry_safe() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index e02c3d88dc9a27375ee85c36d8df4c01b29a376c..6ed6424807b6bff2acde04799a415cba21c5fad2 100644 (file)
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -311,28 +311,24 @@ static struct extent_node *__lookup_extent_tree_ret(struct extent_tree *et,
        tmp_node = parent;
        if (parent && fofs > en->ei.fofs)
                tmp_node = rb_next(parent);
-       *next_ex = tmp_node ?
-               rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+       *next_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
 
        tmp_node = parent;
        if (parent && fofs < en->ei.fofs)
                tmp_node = rb_prev(parent);
-       *prev_ex = tmp_node ?
-               rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+       *prev_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
        return NULL;
 
 lookup_neighbors:
        if (fofs == en->ei.fofs) {
                /* lookup prev node for merging backward later */
                tmp_node = rb_prev(&en->rb_node);
-               *prev_ex = tmp_node ?
-                       rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+               *prev_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
        }
        if (fofs == en->ei.fofs + en->ei.len - 1) {
                /* lookup next node for merging frontward later */
                tmp_node = rb_next(&en->rb_node);
-               *next_ex = tmp_node ?
-                       rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+               *next_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
        }
        return en;
 }
@@ -493,9 +489,8 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
                if (!next_en) {
                        struct rb_node *node = rb_next(&en->rb_node);
 
-                       next_en = node ?
-                               rb_entry(node, struct extent_node, rb_node)
-                               : NULL;
+                       next_en = rb_entry_safe(node, struct extent_node,
+                                               rb_node);
                }
 
                if (parts)