aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorHaicheng Li <haicheng.li@linux.intel.com>2013-05-06 11:15:42 -0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-08 06:54:21 -0400
commit8760952d92b2fd2310fac340ff5bcdf3ada500d7 (patch)
tree395325ca7bc37bb1dac9efa2aae9cfcade939234 /fs/f2fs
parent95630cbadc3588abff24a4b1989b72c943b27512 (diff)
f2fs: code cleanup for scan_nat_page() and build_free_nids()
This patch does two cleanups: 1. remove unused variable "fcnt" in build_free_nids(). 2. make scan_nat_page() as void type and remove useless variable "fcnt". Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/node.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index d682f34ee0f8..122200e677a4 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1292,12 +1292,11 @@ static void remove_free_nid(struct f2fs_nm_info *nm_i, nid_t nid)
1292 spin_unlock(&nm_i->free_nid_list_lock); 1292 spin_unlock(&nm_i->free_nid_list_lock);
1293} 1293}
1294 1294
1295static int scan_nat_page(struct f2fs_nm_info *nm_i, 1295static void scan_nat_page(struct f2fs_nm_info *nm_i,
1296 struct page *nat_page, nid_t start_nid) 1296 struct page *nat_page, nid_t start_nid)
1297{ 1297{
1298 struct f2fs_nat_block *nat_blk = page_address(nat_page); 1298 struct f2fs_nat_block *nat_blk = page_address(nat_page);
1299 block_t blk_addr; 1299 block_t blk_addr;
1300 int fcnt = 0;
1301 int i; 1300 int i;
1302 1301
1303 i = start_nid % NAT_ENTRY_PER_BLOCK; 1302 i = start_nid % NAT_ENTRY_PER_BLOCK;
@@ -1308,9 +1307,8 @@ static int scan_nat_page(struct f2fs_nm_info *nm_i,
1308 blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr); 1307 blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr);
1309 BUG_ON(blk_addr == NEW_ADDR); 1308 BUG_ON(blk_addr == NEW_ADDR);
1310 if (blk_addr == NULL_ADDR) 1309 if (blk_addr == NULL_ADDR)
1311 fcnt += add_free_nid(nm_i, start_nid); 1310 add_free_nid(nm_i, start_nid);
1312 } 1311 }
1313 return fcnt;
1314} 1312}
1315 1313
1316static void build_free_nids(struct f2fs_sb_info *sbi) 1314static void build_free_nids(struct f2fs_sb_info *sbi)
@@ -1319,7 +1317,7 @@ static void build_free_nids(struct f2fs_sb_info *sbi)
1319 struct f2fs_nm_info *nm_i = NM_I(sbi); 1317 struct f2fs_nm_info *nm_i = NM_I(sbi);
1320 struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA); 1318 struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
1321 struct f2fs_summary_block *sum = curseg->sum_blk; 1319 struct f2fs_summary_block *sum = curseg->sum_blk;
1322 int fcnt = 0, i = 0; 1320 int i = 0;
1323 nid_t nid = nm_i->next_scan_nid; 1321 nid_t nid = nm_i->next_scan_nid;
1324 1322
1325 /* Enough entries */ 1323 /* Enough entries */
@@ -1332,7 +1330,7 @@ static void build_free_nids(struct f2fs_sb_info *sbi)
1332 while (1) { 1330 while (1) {
1333 struct page *page = get_current_nat_page(sbi, nid); 1331 struct page *page = get_current_nat_page(sbi, nid);
1334 1332
1335 fcnt += scan_nat_page(nm_i, page, nid); 1333 scan_nat_page(nm_i, page, nid);
1336 f2fs_put_page(page, 1); 1334 f2fs_put_page(page, 1);
1337 1335
1338 nid += (NAT_ENTRY_PER_BLOCK - (nid % NAT_ENTRY_PER_BLOCK)); 1336 nid += (NAT_ENTRY_PER_BLOCK - (nid % NAT_ENTRY_PER_BLOCK));