lkml.org 
[lkml]   [2023]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] f2fs: fix to check return value of f2fs_recover_xattr_data
From
On 2023/12/8 16:50, Zhiguo Niu wrote:
> Should check return value of f2fs_recover_xattr_data in
> __f2fs_setxattr rather than doing invalid retry if error happen.
>
> Also just do set_page_dirty in f2fs_recover_xattr_data when
> page is changed really.
>
> Fixes: 50a472bbc79f ("f2fs: do not return EFSCORRUPTED, but try to run online repair")
> Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
> ---
> fs/f2fs/node.c | 6 +++---
> fs/f2fs/xattr.c | 12 +++++++-----
> 2 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
> index e50a093..93bf724 100644
> --- a/fs/f2fs/node.c
> +++ b/fs/f2fs/node.c
> @@ -2754,11 +2754,11 @@ int f2fs_recover_xattr_data(struct inode *inode, struct page *page)
> f2fs_update_inode_page(inode);
>
> /* 3: update and set xattr node page dirty */
> - if (page)
> + if (page) {
> memcpy(F2FS_NODE(xpage), F2FS_NODE(page),
> VALID_XATTR_BLOCK_SIZE);
> -
> - set_page_dirty(xpage);
> + set_page_dirty(xpage);
> + }
> f2fs_put_page(xpage, 1);
>
> return 0;
> diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
> index 47e88b4..de92891 100644
> --- a/fs/f2fs/xattr.c
> +++ b/fs/f2fs/xattr.c
> @@ -660,11 +660,13 @@ static int __f2fs_setxattr(struct inode *inode, int index,
> here = __find_xattr(base_addr, last_base_addr, NULL, index, len, name);
> if (!here) {
> if (!F2FS_I(inode)->i_xattr_nid) {
> - f2fs_notice(F2FS_I_SB(inode),
> - "recover xattr in inode (%lu)", inode->i_ino);
> - f2fs_recover_xattr_data(inode, NULL);
> - kfree(base_addr);
> - goto retry;
> + error = f2fs_recover_xattr_data(inode, NULL);

How about printing here?

f2fs_notice(F2FS_I_SB(inode),
"recover xattr in inode (%lu), error: %d", inode->i_ino, error);

Thanks,

> + if (!error) {
> + f2fs_notice(F2FS_I_SB(inode),
> + "recover xattr in inode (%lu)", inode->i_ino);
> + kfree(base_addr);
> + goto retry;
> + }
> }
> f2fs_err(F2FS_I_SB(inode), "set inode (%lu) has corrupted xattr",
> inode->i_ino);

\
 
 \ /
  Last update: 2023-12-12 02:40    [W:0.037 / U:1.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site