Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70cfed88 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

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: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 70407fad

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;