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

Commit 39685b35 authored by Sheng Yong's avatar Sheng Yong Committed by Jaegeuk Kim
Browse files

f2fs: remove unused parameter 



Commit d260081c ("f2fs: change recovery policy of xattr node block")
removes the use of blkaddr, which is no longer used. So remove the
parameter.

Signed-off-by: default avatarSheng Yong <shengyong1@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b8357704

fs/f2fs/f2fs.h

+1 −2
Original line number Diff line number Diff line
@@ -2607,8 +2607,7 @@ void alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid); 
void alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid);

int try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink);

void recover_inline_xattr(struct inode *inode, struct page *page);

int recover_xattr_data(struct inode *inode, struct page *page,

			block_t blkaddr);

int recover_xattr_data(struct inode *inode, struct page *page);

int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);

int restore_node_summary(struct f2fs_sb_info *sbi,

			unsigned int segno, struct f2fs_summary_block *sum);

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -2243,7 +2243,7 @@ void recover_inline_xattr(struct inode *inode, struct page *page) 
	f2fs_put_page(ipage, 1);

}



int recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)

int recover_xattr_data(struct inode *inode, struct page *page)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	nid_t prev_xnid = F2FS_I(inode)->i_xattr_nid;

fs/f2fs/recovery.c

+3 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi, 
}



static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,

					struct page *page, block_t blkaddr)

					struct page *page)

{

	struct dnode_of_data dn;

	struct node_info ni;
@@ -415,7 +415,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, 
	if (IS_INODE(page)) {

		recover_inline_xattr(inode, page);

	} else if (f2fs_has_xattr_block(ofs_of_node(page))) {

		err = recover_xattr_data(inode, page, blkaddr);

		err = recover_xattr_data(inode, page);

		if (!err)

			recovered++;

		goto out;
@@ -568,7 +568,7 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list, 
				break;

			}

		}

		err = do_recover_data(sbi, entry->inode, page, blkaddr);

		err = do_recover_data(sbi, entry->inode, page);

		if (err) {

			f2fs_put_page(page, 1);

			break;