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.
So if a new file is created (its inode has I_NEW flag and must have
no pin/atomic/swap flag), instead of calling f2fs_should_compress(),
checking its file type is enough here.
Signed-off-by: Sheng Yong <[email protected]>
---
fs/f2fs/namei.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index e104409c3a0e5..99dbd051ae0ba 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -295,9 +295,14 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
if (!f2fs_sb_has_compression(sbi) ||
F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
- !f2fs_may_compress(inode) ||
(!ext_cnt && !noext_cnt))
return;
+ if (inode->i_state & I_NEW) {
+ if (!S_ISREG(inode->i_mode))
+ return;
+ } else if (!f2fs_may_compress(inode)) {
+ return;
+ }
f2fs_down_read(&sbi->sb_lock);
--
2.25.1
________________________________
OPPO
本电子邮件及其附件含有OPPO公司的保密信息，仅限于邮件指明的收件人（包含个人及群组）使用。禁止任何人在未经授权的情况下以任何形式使用。如果您错收了本邮件，切勿传播、分发、复制、印刷或使用本邮件之任何部分或其所载之任何内容，并请立即以电子邮件通知发件人并删除本邮件及其附件。
网络通讯固有缺陷可能导致邮件被截留、修改、丢失、破坏或包含计算机病毒等不安全情况，OPPO对此类错误或遗漏而引致之任何损失概不承担责任并保留与本邮件相关之一切权利。
除非明确说明，本邮件及其附件无意作为在任何国家或地区之要约、招揽或承诺，亦无意作为任何交易或合同之正式确认。 发件人、其所属机构或所属机构之关联机构或任何上述机构之股东、董事、高级管理人员、员工或其他任何人（以下称“发件人”）不因本邮件之误送而放弃其所享之任何权利，亦不对因故意或过失使用该等信息而引发或可能引发的损失承担任何责任。
文化差异披露：因中外文化差异影响，单纯以YES\OK或其他简单词汇的回复并不构成发件人对任何交易或合同之正式确认或接受，请与发件人再次确认以获得明确书面意见。发件人不对任何受文化差异影响而导致故意或错误使用该等信息所造成的任何直接或间接损害承担责任。
This e-mail and its attachments contain confidential information from OPPO, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you are not the intended recipient, please do not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.
Electronic communications may contain computer viruses or other defects inherently, may not be accurately and/or timely transmitted to other systems, or may be intercepted, modified ,delayed, deleted or interfered. OPPO shall not be liable for any damages that arise or may arise from such matter and reserves all rights in connection with the email.
Unless expressly stated, this e-mail and its attachments are provided without any warranty, acceptance or promise of any kind in any country or region, nor constitute a formal confirmation or acceptance of any transaction or contract. The sender, together with its affiliates or any shareholder, director, officer, employee or any other person of any such institution (hereinafter referred to as "sender" or "OPPO") does not waive any rights and shall not be liable for any damages that arise or may arise from the intentional or negligent use of such information.
Cultural Differences Disclosure：Due to cultural differences between China and foreign countries, any reply with only YES\OK or other simple words does not constitute any confirmation or acceptance of any transaction or contract, please confirm with the sender again to ensure clear opinion in written form. The sender shall not be responsible for any direct or indirect damages resulting from the intentional or misuse of such information.
On 2022/11/9 19:01, 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.
>
> So if a new file is created (its inode has I_NEW flag and must have
> no pin/atomic/swap flag), instead of calling f2fs_should_compress(),
> checking its file type is enough here.
>
> Signed-off-by: Sheng Yong <[email protected]>
> ---
> fs/f2fs/namei.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> index e104409c3a0e5..99dbd051ae0ba 100644
> --- a/fs/f2fs/namei.c
> +++ b/fs/f2fs/namei.c
> @@ -295,9 +295,14 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>
> if (!f2fs_sb_has_compression(sbi) ||
> F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
> - !f2fs_may_compress(inode) ||
> (!ext_cnt && !noext_cnt))
> return;
> + if (inode->i_state & I_NEW) {
> + if (!S_ISREG(inode->i_mode))
> + return;
> + } else if (!f2fs_may_compress(inode)) {
> + return;
> + }
How about moving set_compress_inode() into f2fs_new_inode()?
if (f2fs_sb_has_compression(sbi)) {
/* Inherit the compression flag in directory */
if ((F2FS_I(dir)->i_flags & F2FS_COMPR_FL) &&
f2fs_may_compress(inode))
set_compress_context(inode);
set_compress_inode(sbi, inode, name);
}
/* Should enable inline_data after compression set */
if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
set_inode_flag(inode, FI_INLINE_DATA);
>
> f2fs_down_read(&sbi->sb_lock);
>
> --
> 2.25.1
在 2022/11/9 21:57, Chao Yu 写道:
> On 2022/11/9 19:01, 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.
>>
>> So if a new file is created (its inode has I_NEW flag and must have
>> no pin/atomic/swap flag), instead of calling f2fs_should_compress(),
>> checking its file type is enough here.
>>
>> Signed-off-by: Sheng Yong <[email protected]>
>> ---
>> fs/f2fs/namei.c | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
>> index e104409c3a0e5..99dbd051ae0ba 100644
>> --- a/fs/f2fs/namei.c
>> +++ b/fs/f2fs/namei.c
>> @@ -295,9 +295,14 @@ static void set_compress_inode(struct
>> f2fs_sb_info *sbi, struct inode *inode,
>>
>> if (!f2fs_sb_has_compression(sbi) ||
>> F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
>> - !f2fs_may_compress(inode) ||
>> (!ext_cnt && !noext_cnt))
>> return;
>> + if (inode->i_state & I_NEW) {
>> + if (!S_ISREG(inode->i_mode))
>> + return;
>> + } else if (!f2fs_may_compress(inode)) {
>> + return;
>> + }
>
> How about moving set_compress_inode() into f2fs_new_inode()?
Hi, Chao
I prefer not to move it. Because set_compress_inode() needs
dentry->d_name as a parameter, but dentry is not passed to
f2fs_new_inode(). I think that's why it was called outside of
f2fs_new_inode() in the first place.
thanks,
shengyong
>
> if (f2fs_sb_has_compression(sbi)) {
> /* Inherit the compression flag in directory */
> if ((F2FS_I(dir)->i_flags & F2FS_COMPR_FL) &&
> f2fs_may_compress(inode))
> set_compress_context(inode);
>
> set_compress_inode(sbi, inode, name);
> }
>
> /* Should enable inline_data after compression set */
> if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
> set_inode_flag(inode, FI_INLINE_DATA);
>
>>
>> f2fs_down_read(&sbi->sb_lock);
>>
>> --
>> 2.25.1