f2fs: kill __is_extent_same

Since commit ee6d182f2a19 ("f2fs: remove syncing inode page in all the
cases") delayed inode element updating from inode cache to node page
cache, so once largest cached extent is updated, we can make inode dirty
immediately instead of checking and updating it in the end of extent
cache update.

The above commit didn't clean up unneeded codes in extent_cache.c, let's
finish the job in this patch.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 0ab5518e45c2433cdeff0270a19e27a58fb86dda..c6934f014e0f1d9a458a6489422612a6484fe198 100644 (file)
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -413,7 +413,7 @@ do_insert:
        return en;
 }
 
-static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
+static void f2fs_update_extent_tree_range(struct inode *inode,
                                pgoff_t fofs, block_t blkaddr, unsigned int len)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
@@ -426,7 +426,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
        unsigned int pos = (unsigned int)fofs;
 
        if (!et)
-               return false;
+               return;
 
        trace_f2fs_update_extent_tree_range(inode, fofs, blkaddr, len);
 
@@ -434,7 +434,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
 
        if (is_inode_flag_set(inode, FI_NO_EXTENT)) {
                write_unlock(&et->lock);
-               return false;
+               return;
        }
 
        prev = et->largest;
@@ -531,8 +531,6 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
                __free_extent_tree(sbi, et);
 
        write_unlock(&et->lock);
-
-       return !__is_extent_same(&prev, &et->largest);
 }
 
 unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 8c0916ae0bea0e788c268b8f685f36b13adb23b7..633f2efc8c170641bc9801fdc8ab1f2b88e31672 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -496,13 +496,6 @@ static inline void set_extent_info(struct extent_info *ei, unsigned int fofs,
        ei->len = len;
 }
 
-static inline bool __is_extent_same(struct extent_info *ei1,
-                                               struct extent_info *ei2)
-{
-       return (ei1->fofs == ei2->fofs && ei1->blk == ei2->blk &&
-                                               ei1->len == ei2->len);
-}
-
 static inline bool __is_extent_mergeable(struct extent_info *back,
                                                struct extent_info *front)
 {