]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
f2fs: check the node block address of newly allocated nid
authorJaegeuk Kim <jaegeuk@kernel.org>
Sun, 16 Aug 2015 20:04:50 +0000 (13:04 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 20 Aug 2015 16:00:14 +0000 (09:00 -0700)
This patch adds a routine which checks the block address of newly allocated nid.
If an nid has already allocated by other thread due to subtle data races, it
will result in filesystem corruption.
So, it needs to check whether its block address was already allocated or not
in prior to nid allocation as the last chance.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/node.c

index 3cc32b8f82044b0a4f85fb68800ff783a2290a7b..6bef5a2788b45d1aac1d7dbb069c5abb7a6c2f89 100644 (file)
@@ -1573,6 +1573,8 @@ 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)
@@ -1583,6 +1585,13 @@ 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);