f2fs: don't set cached_en if it will be freed
authorJaegeuk Kim <jaegeuk@kernel.org>
Tue, 26 Jan 2016 17:20:05 +0000 (09:20 -0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 23 Feb 2016 00:07:23 +0000 (16:07 -0800)
If en has empty list pointer, it will be freed sooner, so we don't need to
set cached_en with it.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/extent_cache.c

index 995a7b1baa70801cab9ac624ba10af7cfa159361..aae99f2a4345794fc9bcdfa94d354c38ffccc268 100644 (file)
@@ -243,9 +243,10 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,
        if (en) {
                *ei = en->ei;
                spin_lock(&sbi->extent_lock);
-               if (!list_empty(&en->list))
+               if (!list_empty(&en->list)) {
                        list_move_tail(&en->list, &sbi->extent_list);
-               et->cached_en = en;
+                       et->cached_en = en;
+               }
                spin_unlock(&sbi->extent_lock);
                ret = true;
        }
@@ -364,11 +365,12 @@ static struct extent_node *__try_merge_extent_node(struct f2fs_sb_info *sbi,
                return NULL;
 
        __try_update_largest_extent(et, en);
-       et->cached_en = en;
 
        spin_lock(&sbi->extent_lock);
-       if (!list_empty(&en->list))
+       if (!list_empty(&en->list)) {
                list_move_tail(&en->list, &sbi->extent_list);
+               et->cached_en = en;
+       }
        spin_unlock(&sbi->extent_lock);
        return en;
 }
@@ -405,11 +407,11 @@ do_insert:
                return NULL;
 
        __try_update_largest_extent(et, en);
-       et->cached_en = en;
 
        /* update in global extent list */
        spin_lock(&sbi->extent_lock);
        list_add_tail(&en->list, &sbi->extent_list);
+       et->cached_en = en;
        spin_unlock(&sbi->extent_lock);
        return en;
 }
This page took 0.031445 seconds and 5 git commands to generate.