f2fs: avoid skipping recover_inline_xattr after recover_inline_data
Subsystems (2)
PATCH 1/1 f2fs: avoid skipping recover_inline_xattr after recover_inline_data
When we recover data of inode in roll-forward procedure, and the inode has both inline data and inline xattr. We may skip recovering inline xattr if we recover inline data form node page first.
This patch will fix the problem that we lost inline xattr data in above scenario.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/f2fs.h | 1 + fs/f2fs/node.c | 4 +--- fs/f2fs/recovery.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/f2fs.h +1 -0
@@ -1204,6 +1204,7 @@ void alloc_nid_done(struct f2fs_sb_info *, nid_t);void alloc_nid_failed (struct f2fs_sb_info *,nid_t );void recover_node_page (struct f2fs_sb_info *,struct page *,struct f2fs_summary *,struct node_info *,block_t ); +void recover_inline_xattr (struct inode *,struct page *);bool recover_xattr_data (struct inode *,struct page *,block_t );int recover_inode_page (struct f2fs_sb_info *,struct page *); int restore_node_summary(struct f2fs_sb_info *, unsigned int,
fs/f2fs/node.c +1 -3
@@ -1549,7 +1549,7 @@ void recover_node_page(struct f2fs_sb_info *sbi, struct page *page,clear_node_page_dirty (page); } -static void recover_inline_xattr (struct inode *inode,struct page *page) +void recover_inline_xattr (struct inode *inode,struct page *page) {struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);void *src_addr, *dst_addr;
@@ -1588,8 +1588,6 @@ bool recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)nid_t new_xnid =nid_of_node (page);struct node_info ni; -recover_inline_xattr (inode, page); -if (!f2fs_has_xattr_block (ofs_of_node (page)))return false;
fs/f2fs/recovery.c +2 -0
@@ -300,6 +300,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,struct node_info ni;int err =0 , recovered =0 ; +recover_inline_xattr (inode, page); +if (recover_inline_data (inode, page)) goto out;
Signature · 10 lines
2.0.1.474.g72c7794 ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds