From: Haicheng Li <haicheng.li@linux.intel.com>
To: linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
Jaegeuk Kim <jaegeuk.kim@samsung.com>
Cc: linux-kernel@vger.kernel.org,
Haicheng Li <haicheng.lee@gmail.com>,
Haicheng Li <haicheng.li@linux.intel.com>
Subject: [PATCH 2/4] f2fs: code cleanup for scan_nat_page() and build_free_nids()
Date: Mon, 6 May 2013 23:15:42 +0800 [thread overview]
Message-ID: <1367853344-28938-3-git-send-email-haicheng.li@linux.intel.com> (raw)
In-Reply-To: <1367853344-28938-1-git-send-email-haicheng.li@linux.intel.com>
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>
---
fs/f2fs/node.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 532ac57..1b45dd0 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));
--
1.7.9.5
next prev parent reply other threads:[~2013-05-06 15:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-06 15:15 [PATCH V2 0/4] f2fs: various optimization & bugfixing for node management Haicheng Li
2013-05-06 15:15 ` [PATCH 1/4] f2fs: bugfix for alloc_nid_failed() Haicheng Li
2013-05-06 15:15 ` Haicheng Li [this message]
2013-05-06 15:15 ` [PATCH 3/4] f2fs: optimize scan_nat_page() Haicheng Li
2013-05-07 10:36 ` Jaegeuk Kim
2013-05-08 5:31 ` Haicheng Li
2013-05-06 15:15 ` [PATCH 4/4] f2fs: optimize build_free_nids() Haicheng Li
2013-05-07 10:33 ` Jaegeuk Kim
2013-05-08 6:24 ` Haicheng Li
2013-05-08 9:50 ` Jaegeuk Kim
2013-05-08 11:50 ` Haicheng Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367853344-28938-3-git-send-email-haicheng.li@linux.intel.com \
--to=haicheng.li@linux.intel.com \
--cc=haicheng.lee@gmail.com \
--cc=jaegeuk.kim@samsung.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).