aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChao Yu <yuchao0@huawei.com>2017-02-25 04:29:54 -0500
committerJaegeuk Kim <jaegeuk@kernel.org>2017-02-27 13:07:43 -0500
commit317e13009682d4614ec9ac7c2762eaee26f93ed3 (patch)
tree14878aa0d0bbb8fa0b82f315323bd9a9a32a1666
parent19f4e688f89a9ce07b86d06d3df23c1cd877ab4e (diff)
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>
-rw-r--r--fs/f2fs/extent_cache.c8
-rw-r--r--fs/f2fs/f2fs.h7
2 files changed, 3 insertions, 12 deletions
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 0ab5518e45c2..c6934f014e0f 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -413,7 +413,7 @@ do_insert:
413 return en; 413 return en;
414} 414}
415 415
416static unsigned int f2fs_update_extent_tree_range(struct inode *inode, 416static void f2fs_update_extent_tree_range(struct inode *inode,
417 pgoff_t fofs, block_t blkaddr, unsigned int len) 417 pgoff_t fofs, block_t blkaddr, unsigned int len)
418{ 418{
419 struct f2fs_sb_info *sbi = F2FS_I_SB(inode); 419 struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
@@ -426,7 +426,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
426 unsigned int pos = (unsigned int)fofs; 426 unsigned int pos = (unsigned int)fofs;
427 427
428 if (!et) 428 if (!et)
429 return false; 429 return;
430 430
431 trace_f2fs_update_extent_tree_range(inode, fofs, blkaddr, len); 431 trace_f2fs_update_extent_tree_range(inode, fofs, blkaddr, len);
432 432
@@ -434,7 +434,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
434 434
435 if (is_inode_flag_set(inode, FI_NO_EXTENT)) { 435 if (is_inode_flag_set(inode, FI_NO_EXTENT)) {
436 write_unlock(&et->lock); 436 write_unlock(&et->lock);
437 return false; 437 return;
438 } 438 }
439 439
440 prev = et->largest; 440 prev = et->largest;
@@ -531,8 +531,6 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
531 __free_extent_tree(sbi, et); 531 __free_extent_tree(sbi, et);
532 532
533 write_unlock(&et->lock); 533 write_unlock(&et->lock);
534
535 return !__is_extent_same(&prev, &et->largest);
536} 534}
537 535
538unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) 536unsigned 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 8c0916ae0bea..633f2efc8c17 100644
--- 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,
496 ei->len = len; 496 ei->len = len;
497} 497}
498 498
499static inline bool __is_extent_same(struct extent_info *ei1,
500 struct extent_info *ei2)
501{
502 return (ei1->fofs == ei2->fofs && ei1->blk == ei2->blk &&
503 ei1->len == ei2->len);
504}
505
506static inline bool __is_extent_mergeable(struct extent_info *back, 499static inline bool __is_extent_mergeable(struct extent_info *back,
507 struct extent_info *front) 500 struct extent_info *front)
508{ 501{