summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorHaicheng Li <haicheng.li@linux.intel.com>2013-05-06 19:15:42 +0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-08 14:54:21 +0400
commit8760952d92b2fd2310fac340ff5bcdf3ada500d7 (patch)
tree395325ca7bc37bb1dac9efa2aae9cfcade939234 /fs
parent95630cbadc3588abff24a4b1989b72c943b27512 (diff)
downloadlinux-8760952d92b2fd2310fac340ff5bcdf3ada500d7.tar.xz
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')
-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)
spin_unlock(&nm_i->free_nid_list_lock);
}
-static int scan_nat_page(struct f2fs_nm_info *nm_i,
+static void scan_nat_page(struct f2fs_nm_info *nm_i,
struct page *nat_page, nid_t start_nid)
{
struct f2fs_nat_block *nat_blk = page_address(nat_page);
block_t blk_addr;
- int fcnt = 0;
int i;
i = start_nid % NAT_ENTRY_PER_BLOCK;
@@ -1308,9 +1307,8 @@ static int scan_nat_page(struct f2fs_nm_info *nm_i,
blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr);
BUG_ON(blk_addr == NEW_ADDR);
if (blk_addr == NULL_ADDR)
- fcnt += add_free_nid(nm_i, start_nid);
+ add_free_nid(nm_i, start_nid);
}
- return fcnt;
}
static void build_free_nids(struct f2fs_sb_info *sbi)
@@ -1319,7 +1317,7 @@ static void build_free_nids(struct f2fs_sb_info *sbi)
struct f2fs_nm_info *nm_i = NM_I(sbi);
struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
struct f2fs_summary_block *sum = curseg->sum_blk;
- int fcnt = 0, i = 0;
+ int i = 0;
nid_t nid = nm_i->next_scan_nid;
/* Enough entries */
@@ -1332,7 +1330,7 @@ static void build_free_nids(struct f2fs_sb_info *sbi)
while (1) {
struct page *page = get_current_nat_page(sbi, nid);
- fcnt += scan_nat_page(nm_i, page, nid);
+ scan_nat_page(nm_i, page, nid);
f2fs_put_page(page, 1);
nid += (NAT_ENTRY_PER_BLOCK - (nid % NAT_ENTRY_PER_BLOCK));