From 55160d13998452c3a9f60234d6c9cc10c1098ead Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim <jaegeuk@kernel.org> Date: Sat, 2 Jan 2016 09:23:27 -0800 Subject: [PATCH 2/4] Revert "f2fs: check the node block address of newly allocated nid" commit 957efb0c2144cc5ff1795f43bf2d2ca430eaa227 upstream. Original issue is fixed by: f2fs: cover more area with nat_tree_lock This reverts commit 24928634f81b1592e83b37dcd89ed45c28f12feb. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu> --- fs/f2fs/node.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 8f6784f..5ff9224 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1583,8 +1583,6 @@ retry: /* We should not use stale free nids created by build_free_nids */ if (nm_i->fcnt && !on_build_free_nids(nm_i)) { - struct node_info ni; - f2fs_bug_on(sbi, list_empty(&nm_i->free_nid_list)); list_for_each_entry(i, &nm_i->free_nid_list, list) if (i->state == NID_NEW) @@ -1595,13 +1593,6 @@ retry: i->state = NID_ALLOC; nm_i->fcnt--; spin_unlock(&nm_i->free_nid_list_lock); - - /* check nid is allocated already */ - get_node_info(sbi, *nid, &ni); - if (ni.blk_addr != NULL_ADDR) { - alloc_nid_done(sbi, *nid); - goto retry; - } return true; } spin_unlock(&nm_i->free_nid_list_lock); -- 2.7.4