On 2017/11/22 18:23, Sheng Yong wrote:
> Commit d260081ccf37 ("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: Sheng Yong <shengyo...@huawei.com>
Reviewed-by: Chao Yu <yuch...@huawei.com>
Thanks,
> ---
> fs/f2fs/f2fs.h | 3 +--
> fs/f2fs/node.c | 2 +-
> fs/f2fs/recovery.c | 6 +++---
> 3 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index a269d795ba7c..bab4c2287090 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -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);
> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
> index fe1fc662af2a..ebb0d1797431 100644
> --- a/fs/f2fs/node.c
> +++ b/fs/f2fs/node.c
> @@ -2238,7 +2238,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;
> diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
> index 92c57ace1939..7d63faf51e52 100644
> --- a/fs/f2fs/recovery.c
> +++ b/fs/f2fs/recovery.c
> @@ -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;
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
