[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <61637917-440e-4ed1-8820-fc7af8b8b4f3@kernel.org>
Date: Wed, 6 Mar 2024 09:51:56 +0800
From: Chao Yu <chao@...nel.org>
To: Xiuhong Wang <xiuhong.wang@...soc.com>, jaegeuk@...nel.org,
linux-f2fs-devel@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Cc: hongyu.jin.cn@...il.com, niuzhiguo84@...il.com, ke.wang@...soc.com,
xiuhong.wang.cn@...il.com
Subject: Re: [PATCH 1/2] f2fs: compress: relocate some judgments in
f2fs_reserve_compress_blocks
On 2024/3/5 16:40, Xiuhong Wang wrote:
> The following f2fs_io test will get a "0" result instead of -EINVAL,
> unisoc # ./f2fs_io compress file
> unisoc # ./f2fs_io reserve_cblocks file
> 0
> it's not reasonable, so the judgement of
> atomic_read(&F2FS_I(inode)->i_compr_blocks) should be placed after
> the judgement of is_inode_flag_set(inode, FI_COMPRESS_RELEASED).
>
> Fixes: c75488fb4d82 ("f2fs: introduce F2FS_IOC_RESERVE_COMPRESS_BLOCKS")
> Signed-off-by: Xiuhong Wang <xiuhong.wang@...soc.com>
> Signed-off-by: Zhiguo Niu <zhiguo.niu@...soc.com>
> ---
> fs/f2fs/file.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index 4ca6c693b33a..572d7bd4d161 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -3720,18 +3720,18 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
> if (ret)
> return ret;
>
> - if (atomic_read(&F2FS_I(inode)->i_compr_blocks))
> - goto out;
> -
> f2fs_balance_fs(sbi, true);
>
> inode_lock(inode);
>
> if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
> ret = -EINVAL;
> - goto unlock_inode;
Nitpick, maybe keep unlock_inode label is better.
> + goto out;
> }
>
> + if (atomic_read(&F2FS_I(inode)->i_compr_blocks))
> + goto out;
goto unlock_inode
Thanks,
> +
> f2fs_down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
> filemap_invalidate_lock(inode->i_mapping);
>
> @@ -3776,9 +3776,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
> inode_set_ctime_current(inode);
> f2fs_mark_inode_dirty_sync(inode, true);
> }
> -unlock_inode:
> - inode_unlock(inode);
> out:
> + inode_unlock(inode);
> mnt_drop_write_file(filp);
>
> if (ret >= 0) {
Powered by blists - more mailing lists