From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haicheng Li Subject: [PATCH 3/4] f2fs: optimize scan_nat_page() Date: Mon, 6 May 2013 23:15:43 +0800 Message-ID: <1367853344-28938-4-git-send-email-haicheng.li@linux.intel.com> References: <1367853344-28938-1-git-send-email-haicheng.li@linux.intel.com> Cc: linux-kernel@vger.kernel.org, Haicheng Li , Haicheng Li To: linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim Return-path: In-Reply-To: <1367853344-28938-1-git-send-email-haicheng.li@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org When nm_i->fcnt > 2 * MAX_FREE_NIDS, stop scanning other NAT entries. Signed-off-by: Haicheng Li --- fs/f2fs/node.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 1b45dd0..1fe3fe2 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1254,7 +1254,7 @@ static int add_free_nid(struct f2fs_nm_info *nm_i, nid_t nid) struct free_nid *i; if (nm_i->fcnt > 2 * MAX_FREE_NIDS) - return 0; + return -1; /* 0 nid should not be used */ if (nid == 0) @@ -1302,12 +1302,17 @@ static void scan_nat_page(struct f2fs_nm_info *nm_i, i = start_nid % NAT_ENTRY_PER_BLOCK; for (; i < NAT_ENTRY_PER_BLOCK; i++, start_nid++) { + int cnt; + if (start_nid >= nm_i->max_nid) break; - blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr); + blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr); BUG_ON(blk_addr == NEW_ADDR); - if (blk_addr == NULL_ADDR) - add_free_nid(nm_i, start_nid); + if (blk_addr == NULL_ADDR) { + cnt = add_free_nid(nm_i, start_nid); + if (cnt < 0) + break; + } } } -- 1.7.9.5