f2fs: set cached_en after checking finally

This patch relocates cached_en not only to be covered by spin_lock, but also
to set once after checking out completely.

Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 176e4ad4e5ed724c28cdf3d1970a35519c4b6630..982a1a58efd75dc61f255f3032f1c5db49b4415c 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -453,14 +453,12 @@ static struct extent_node *__lookup_extent_tree(struct extent_tree *et,
        while (node) {
                en = rb_entry(node, struct extent_node, rb_node);
 
-               if (fofs < en->ei.fofs) {
+               if (fofs < en->ei.fofs)
                        node = node->rb_left;
-               } else if (fofs >= en->ei.fofs + en->ei.len) {
+               else if (fofs >= en->ei.fofs + en->ei.len)
                        node = node->rb_right;
-               } else {
-                       et->cached_en = en;
+               else
                        return en;
-               }
        }
        return NULL;
 }
@@ -625,6 +623,7 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,
                spin_lock(&sbi->extent_lock);
                if (!list_empty(&en->list))
                        list_move_tail(&en->list, &sbi->extent_list);
+               et->cached_en = en;
                spin_unlock(&sbi->extent_lock);
                stat_inc_read_hit(sbi->sb);
        }