f2fs: alloc new nids for xattr block in recovery

recovery file A:			recovery file B:
	-get_dnode_of_data
		-alloc_nid
					-recover_xattr_data
						-set_node_addr(sbi, &ni, NEW_ADDR, false);
							--->bug_on for nid has been used by file A

In recovery process, new allocated node blocks may "reuse" xattr block
nids, this patch alloc new nids for xattr blocks in recovery process to
avoid this problem.

Signed-off-by: Yunlei He <heyunlei@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index adc3a70..5396611 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -19,6 +19,7 @@
 #include "f2fs.h"
 #include "node.h"
 #include "segment.h"
+#include "xattr.h"
 #include "trace.h"
 #include <trace/events/f2fs.h>
 
@@ -2190,7 +2191,8 @@ int recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        nid_t prev_xnid = F2FS_I(inode)->i_xattr_nid;
-       nid_t new_xnid = nid_of_node(page);
+       nid_t new_xnid;
+       struct dnode_of_data dn;
        struct node_info ni;
        struct page *xpage;
 
@@ -2206,22 +2208,22 @@ int recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
 
 recover_xnid:
        /* 2: update xattr nid in inode */
-       remove_free_nid(sbi, new_xnid);
-       f2fs_i_xnid_write(inode, new_xnid);
-       if (unlikely(inc_valid_node_count(sbi, inode, false)))
-               f2fs_bug_on(sbi, 1);
+       if (!alloc_nid(sbi, &new_xnid))
+               return -ENOSPC;
+
+       set_new_dnode(&dn, inode, NULL, NULL, new_xnid);
+       xpage = new_node_page(&dn, XATTR_NODE_OFFSET);
+       if (IS_ERR(xpage)) {
+               alloc_nid_failed(sbi, new_xnid);
+               return PTR_ERR(xpage);
+       }
+
+       alloc_nid_done(sbi, new_xnid);
        update_inode_page(inode);
 
        /* 3: update and set xattr node page dirty */
-       xpage = grab_cache_page(NODE_MAPPING(sbi), new_xnid);
-       if (!xpage)
-               return -ENOMEM;
-
-       memcpy(F2FS_NODE(xpage), F2FS_NODE(page), PAGE_SIZE);
+       memcpy(F2FS_NODE(xpage), F2FS_NODE(page), VALID_XATTR_BLOCK_SIZE);
 
-       get_node_info(sbi, new_xnid, &ni);
-       ni.ino = inode->i_ino;
-       set_node_addr(sbi, &ni, NEW_ADDR, false);
        set_page_dirty(xpage);
        f2fs_put_page(xpage, 1);