summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYunlei He <heyunlei@huawei.com>2017-11-17 16:13:38 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2018-01-02 19:27:27 -0800
commit66e833613715721f347757ad32f19cb4e26e7363 (patch)
tree58ffc828a9018c4c057db982038d9c5f5088b647
parent292c196a3695e57980dc79dea3863462fa4831c4 (diff)
downloadtalos-obmc-linux-66e833613715721f347757ad32f19cb4e26e7363.tar.gz
talos-obmc-linux-66e833613715721f347757ad32f19cb4e26e7363.zip
f2fs: no need to read nat block if nat_block_bitmap is set
No need to read nat block if nat_block_bitmap is set. Signed-off-by: Yunlei He <heyunlei@huawei.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/node.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 2ce0321ab9c0..93bd89a9a56f 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1930,9 +1930,6 @@ static void scan_nat_page(struct f2fs_sb_info *sbi,
unsigned int nat_ofs = NAT_BLOCK_OFFSET(start_nid);
int i;
- if (test_bit_le(nat_ofs, nm_i->nat_block_bitmap))
- return;
-
__set_bit_le(nat_ofs, nm_i->nat_block_bitmap);
i = start_nid % NAT_ENTRY_PER_BLOCK;
@@ -2037,10 +2034,13 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount)
down_read(&nm_i->nat_tree_lock);
while (1) {
- struct page *page = get_current_nat_page(sbi, nid);
+ if (!test_bit_le(NAT_BLOCK_OFFSET(nid),
+ nm_i->nat_block_bitmap)) {
+ struct page *page = get_current_nat_page(sbi, nid);
- scan_nat_page(sbi, page, nid);
- f2fs_put_page(page, 1);
+ scan_nat_page(sbi, page, nid);
+ f2fs_put_page(page, 1);
+ }
nid += (NAT_ENTRY_PER_BLOCK - (nid % NAT_ENTRY_PER_BLOCK));
if (unlikely(nid >= nm_i->max_nid))
OpenPOWER on IntegriCloud