Re: [PATCH v2 1/2] f2fs: fix to enable compress for newly created file if extension matches

Chao Yu
2022-11-14T16:05:07Z

On 2022/11/12 9:27, Jaegeuk Kim wrote:
> Does thes make sense?

Jaegeuk,

Could you please send modified patches to mailing list, otherwise,
I can not add comments on specified line.

Thanks,

>
> https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev-test&id=608460dfae20b9d23aa222f7448710a086778222
> https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev-test&id=962379487b5cb9f3b85ea367b130c2c6ca584edf
>
> Second one is needed to address build error.
>
> On 11/11, Sheng Yong wrote:
>> If compress_extension is set, and a newly created file matches the
>> extension, the file could be marked as compression file. However,
>> if inline_data is also enabled, there is no chance to check its
>> extension since f2fs_should_compress() always returns false.
>>
>> This patch moves set_compress_inode(), which do extension check, in
>> f2fs_should_compress() to check extensions before setting inline
>> data flag.
>>
>> Fixes: 7165841d578e ("f2fs: fix to check inline_data during compressed inode conversion")
>> Signed-off-by: Sheng Yong <shengyong@oppo.com>
>> ---
>> fs/f2fs/namei.c | 27 +++++++++++++--------------
>> 1 file changed, 13 insertions(+), 14 deletions(-)
>>
>> ---
>> v1->v2: add filename parameter for f2fs_new_inode, and move
>> set_compress_inode into f2fs_new_inode
>>
>> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
>> index e104409c3a0e5..36e251f438568 100644
>> --- a/fs/f2fs/namei.c
>> +++ b/fs/f2fs/namei.c
>> @@ -22,8 +22,12 @@
>> #include "acl.h"
>> #include <trace/events/f2fs.h>
>>
>> +static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>> + const unsigned char *name);
>> +
>> static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>> - struct inode *dir, umode_t mode)
>> + struct inode *dir, umode_t mode,
>> + const char *name)
>> {
>> struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
>> nid_t ino;
>> @@ -119,6 +123,8 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>> if ((F2FS_I(dir)->i_flags & F2FS_COMPR_FL) &&
>> f2fs_may_compress(inode))
>> set_compress_context(inode);
>> + if (name)
>> + set_compress_inode(sbi, inode, name);
>> }
>>
>> /* Should enable inline_data after compression set */
>> @@ -293,8 +299,7 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>> unsigned char noext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;
>> int i, cold_count, hot_count;
>>
>> - if (!f2fs_sb_has_compression(sbi) ||
>> - F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
>> + if (F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
>> !f2fs_may_compress(inode) ||
>> (!ext_cnt && !noext_cnt))
>> return;
>> @@ -326,10 +331,6 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>> for (i = 0; i < ext_cnt; i++) {
>> if (!is_extension_exist(name, ext[i], false))
>> continue;
>> -
>> - /* Do not use inline_data with compression */
>> - stat_dec_inline_inode(inode);
>> - clear_inode_flag(inode, FI_INLINE_DATA);
>> set_compress_context(inode);
>> return;
>> }
>> @@ -352,15 +353,13 @@ static int f2fs_create(struct user_namespace *mnt_userns, struct inode *dir,
>> if (err)
>> return err;
>>
>> - inode = f2fs_new_inode(mnt_userns, dir, mode);
>> + inode = f2fs_new_inode(mnt_userns, dir, mode, dentry->d_name.name);
>> if (IS_ERR(inode))
>> return PTR_ERR(inode);
>>
>> if (!test_opt(sbi, DISABLE_EXT_IDENTIFY))
>> set_file_temperature(sbi, inode, dentry->d_name.name);
>>
>> - set_compress_inode(sbi, inode, dentry->d_name.name);
>> -
>> inode->i_op = &f2fs_file_inode_operations;
>> inode->i_fop = &f2fs_file_operations;
>> inode->i_mapping->a_ops = &f2fs_dblock_aops;
>> @@ -689,7 +688,7 @@ static int f2fs_symlink(struct user_namespace *mnt_userns, struct inode *dir,
>> if (err)
>> return err;
>>
>> - inode = f2fs_new_inode(mnt_userns, dir, S_IFLNK | S_IRWXUGO);
>> + inode = f2fs_new_inode(mnt_userns, dir, S_IFLNK | S_IRWXUGO, NULL);
>> if (IS_ERR(inode))
>> return PTR_ERR(inode);
>>
>> @@ -760,7 +759,7 @@ static int f2fs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
>> if (err)
>> return err;
>>
>> - inode = f2fs_new_inode(mnt_userns, dir, S_IFDIR | mode);
>> + inode = f2fs_new_inode(mnt_userns, dir, S_IFDIR | mode, NULL);
>> if (IS_ERR(inode))
>> return PTR_ERR(inode);
>>
>> @@ -817,7 +816,7 @@ static int f2fs_mknod(struct user_namespace *mnt_userns, struct inode *dir,
>> if (err)
>> return err;
>>
>> - inode = f2fs_new_inode(mnt_userns, dir, mode);
>> + inode = f2fs_new_inode(mnt_userns, dir, mode, NULL);
>> if (IS_ERR(inode))
>> return PTR_ERR(inode);
>>
>> @@ -856,7 +855,7 @@ static int __f2fs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,
>> if (err)
>> return err;
>>
>> - inode = f2fs_new_inode(mnt_userns, dir, mode);
>> + inode = f2fs_new_inode(mnt_userns, dir, mode, NULL);
>> if (IS_ERR(inode))
>> return PTR_ERR(inode);
>>
>> --
>> 2.25.1