From: Jaegeuk Kim Date: Thu, 25 Apr 2013 04:21:12 +0000 (+0900) Subject: f2fs: check nid == 0 in add_free_nid X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9198aceb53a493d1be0f3a5a1ce13c07a6fdcd26;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git f2fs: check nid == 0 in add_free_nid It is more obvious that add_free_nid checks whether the free nid is zero or not. Reviewed-by: Namjae Jeon Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index a0aa0446a237..c8f48d436487 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1245,6 +1245,10 @@ static int add_free_nid(struct f2fs_nm_info *nm_i, nid_t nid) if (nm_i->fcnt > 2 * MAX_FREE_NIDS) return 0; + + /* 0 nid should not be used */ + if (nid == 0) + return 0; retry: i = kmem_cache_alloc(free_nid_slab, GFP_NOFS); if (!i) { @@ -1286,10 +1290,6 @@ static int scan_nat_page(struct f2fs_nm_info *nm_i, int fcnt = 0; int i; - /* 0 nid should not be used */ - if (start_nid == 0) - ++start_nid; - i = start_nid % NAT_ENTRY_PER_BLOCK; for (; i < NAT_ENTRY_PER_BLOCK; i++, start_nid++) {