f2fs: use MAX_FREE_NIDS for the free nids target
PATCH 1/1 f2fs: use MAX_FREE_NIDS for the free nids target
F2FS has define MAX_FREE_NIDS for maximum of cached free nids target.
#define MAX_FREE_NIDS (NAT_ENTRY_PER_BLOCK * FREE_NID_PAGES)
Signed-off-by Kinglong Mee <[email protected]>
--- fs/f2fs/node.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
fs/f2fs/node.c +3 -5
@@ -1870,7 +1870,6 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi)struct curseg_info *curseg =CURSEG_I (sbi,CURSEG_HOT_DATA );struct f2fs_journal *journal = curseg->journal;unsigned int i, idx; -unsigned int target =FREE_NID_PAGES *NAT_ENTRY_PER_BLOCK ;down_read (&nm_i->nat_tree_lock);
@@ -1886,7 +1885,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) nid = i *NAT_ENTRY_PER_BLOCK + idx;add_free_nid (sbi, nid, true); -if (nm_i->nid_cnt[FREE_NID_LIST ] >= target) +if (nm_i->nid_cnt[FREE_NID_LIST ] >=MAX_FREE_NIDS ) goto out; } }
@@ -1912,7 +1911,6 @@ static int scan_nat_bits(struct f2fs_sb_info *sbi)struct f2fs_nm_info *nm_i =NM_I (sbi);struct page *page;unsigned int i =0 ; -nid_t target =FREE_NID_PAGES *NAT_ENTRY_PER_BLOCK ;nid_t nid;if (!enabled_nat_bits (sbi,NULL ))
@@ -1933,7 +1931,7 @@ static int scan_nat_bits(struct f2fs_sb_info *sbi)add_free_nid (sbi, nid, true); } -if (nm_i->nid_cnt[FREE_NID_LIST ] >= target) +if (nm_i->nid_cnt[FREE_NID_LIST ] >=MAX_FREE_NIDS ) goto out; i++; goto check_empty;
@@ -1951,7 +1949,7 @@ static int scan_nat_bits(struct f2fs_sb_info *sbi)scan_nat_page (sbi, page, nid);f2fs_put_page (page,1 ); -if (nm_i->nid_cnt[FREE_NID_LIST ] < target) { +if (nm_i->nid_cnt[FREE_NID_LIST ] <MAX_FREE_NIDS ) { i++; goto check_partial; }
Signature · 6 lines
2.9.3 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
Quoted 5 lines · Kinglong Mee
F2FS has define
MAX_FREE_NIDSfor maximum of cached free nids target.#define
MAX_FREE_NIDS(NAT_ENTRY_PER_BLOCK*FREE_NID_PAGES)Signed-off-by Kinglong Mee <[email protected]>
All clean patches looks good to me.
To Jaegeuk, please add:
Reviewed-by Chao Yu <[email protected]>
Thanks,
Quoted 44 lines
--- fs/f2fs/node.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)fs/f2fs/node.c +2
-4@@ -1870,7 +1870,6 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi)struct curseg_info *curseg =CURSEG_I (sbi,CURSEG_HOT_DATA );struct f2fs_journal *journal = curseg->journal;unsigned int i, idx; -unsigned int target =FREE_NID_PAGES *NAT_ENTRY_PER_BLOCK ;down_read (&nm_i->nat_tree_lock);@@ -1886,7 +1885,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) nid = i *NAT_ENTRY_PER_BLOCK + idx;add_free_nid (sbi, nid, true); -if (nm_i->nid_cnt[FREE_NID_LIST ] >= target) +if (nm_i->nid_cnt[FREE_NID_LIST ] >=MAX_FREE_NIDS ) goto out; } }@@ -1912,7 +1911,6 @@ static int scan_nat_bits(struct f2fs_sb_info *sbi)struct f2fs_nm_info *nm_i =NM_I (sbi);struct page *page;unsigned int i =0 ; -nid_t target =FREE_NID_PAGES *NAT_ENTRY_PER_BLOCK ;nid_t nid;if (!enabled_nat_bits (sbi,NULL ))@@ -1933,7 +1931,7 @@ static int scan_nat_bits(struct f2fs_sb_info *sbi)add_free_nid (sbi, nid, true); } -if (nm_i->nid_cnt[FREE_NID_LIST ] >= target) +if (nm_i->nid_cnt[FREE_NID_LIST ] >=MAX_FREE_NIDS ) goto out; i++; goto check_empty;
fs/f2fs/node.c static int scan_nat_bits(struct f2fs_sb_info *sbi) · line 1955
Quoted 8 lines
fs/f2fs/node.c +1
-1@@ -1951,7 +1949,7 @@ static int scan_nat_bits(struct f2fs_sb_info *sbi)scan_nat_page (sbi, page, nid);f2fs_put_page (page,1 ); -if (nm_i->nid_cnt[FREE_NID_LIST ] < target) { +if (nm_i->nid_cnt[FREE_NID_LIST ] <MAX_FREE_NIDS ) { i++; goto check_partial; }
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot