stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] f2fs: attach inline_data after setting compression
@ 2022-06-17 22:31 Jaegeuk Kim
  2022-06-19  0:35 ` [f2fs-dev] " Chao Yu
  2022-06-22 16:53 ` [PATCH 1/3 v2] " Jaegeuk Kim
  0 siblings, 2 replies; 7+ messages in thread
From: Jaegeuk Kim @ 2022-06-17 22:31 UTC (permalink / raw)
  To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim, stable

This fixes the below corruption.

[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix

Cc: <stable@vger.kernel.org>
Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/namei.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index c549acb52ac4..a841abe6a071 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 	if (test_opt(sbi, INLINE_XATTR))
 		set_inode_flag(inode, FI_INLINE_XATTR);
 
-	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
-		set_inode_flag(inode, FI_INLINE_DATA);
 	if (f2fs_may_inline_dentry(inode))
 		set_inode_flag(inode, FI_INLINE_DENTRY);
 
@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 
 	f2fs_init_extent_tree(inode, NULL);
 
-	stat_inc_inline_xattr(inode);
-	stat_inc_inline_inode(inode);
-	stat_inc_inline_dir(inode);
-
 	F2FS_I(inode)->i_flags =
 		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
 
@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 			set_compress_context(inode);
 	}
 
+	/* 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);
+
+	stat_inc_inline_xattr(inode);
+	stat_inc_inline_inode(inode);
+	stat_inc_inline_dir(inode);
+
 	f2fs_set_inode_flags(inode);
 
 	trace_f2fs_new_inode(inode, 0);
@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
 		if (!is_extension_exist(name, ext[i], false))
 			continue;
 
+		/* Do not use inline_data with compression */
+		clear_inode_flag(inode, FI_INLINE_DATA);
 		set_compress_context(inode);
 		return;
 	}
-- 
2.36.1.476.g0c4daa206d-goog


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [f2fs-dev] [PATCH 1/3] f2fs: attach inline_data after setting compression
  2022-06-17 22:31 [PATCH 1/3] f2fs: attach inline_data after setting compression Jaegeuk Kim
@ 2022-06-19  0:35 ` Chao Yu
  2022-06-22 14:06   ` Chao Yu
  2022-06-22 16:53 ` [PATCH 1/3 v2] " Jaegeuk Kim
  1 sibling, 1 reply; 7+ messages in thread
From: Chao Yu @ 2022-06-19  0:35 UTC (permalink / raw)
  To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel; +Cc: stable

On 2022/6/18 6:31, Jaegeuk Kim wrote:
> This fixes the below corruption.
> 
> [345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
> 
> Cc: <stable@vger.kernel.org>
> Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
>   fs/f2fs/namei.c | 16 ++++++++++------
>   1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> index c549acb52ac4..a841abe6a071 100644
> --- a/fs/f2fs/namei.c
> +++ b/fs/f2fs/namei.c
> @@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>   	if (test_opt(sbi, INLINE_XATTR))
>   		set_inode_flag(inode, FI_INLINE_XATTR);
>   
> -	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
> -		set_inode_flag(inode, FI_INLINE_DATA);
>   	if (f2fs_may_inline_dentry(inode))
>   		set_inode_flag(inode, FI_INLINE_DENTRY);
>   
> @@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>   
>   	f2fs_init_extent_tree(inode, NULL);
>   
> -	stat_inc_inline_xattr(inode);
> -	stat_inc_inline_inode(inode);
> -	stat_inc_inline_dir(inode);
> -
>   	F2FS_I(inode)->i_flags =
>   		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
>   
> @@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>   			set_compress_context(inode);
>   	}
>   
> +	/* 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);
> +
> +	stat_inc_inline_xattr(inode);
> +	stat_inc_inline_inode(inode);
> +	stat_inc_inline_dir(inode);
> +
>   	f2fs_set_inode_flags(inode);
>   
>   	trace_f2fs_new_inode(inode, 0);
> @@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>   		if (!is_extension_exist(name, ext[i], false))
>   			continue;
>   
> +		/* Do not use inline_data with compression */
> +		clear_inode_flag(inode, FI_INLINE_DATA);

if (is_inode_set_flag()) {
	clear_inode_flag();
	stat_dec_inline_inode();
}

Thanks,

>   		set_compress_context(inode);
>   		return;
>   	}

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [f2fs-dev] [PATCH 1/3] f2fs: attach inline_data after setting compression
  2022-06-19  0:35 ` [f2fs-dev] " Chao Yu
@ 2022-06-22 14:06   ` Chao Yu
  2022-06-22 16:52     ` Jaegeuk Kim
  0 siblings, 1 reply; 7+ messages in thread
From: Chao Yu @ 2022-06-22 14:06 UTC (permalink / raw)
  To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel; +Cc: stable

On 2022/6/19 8:35, Chao Yu wrote:
> On 2022/6/18 6:31, Jaegeuk Kim wrote:
>> This fixes the below corruption.
>>
>> [345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
>>
>> Cc: <stable@vger.kernel.org>
>> Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
>> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
>> ---
>>    fs/f2fs/namei.c | 16 ++++++++++------
>>    1 file changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
>> index c549acb52ac4..a841abe6a071 100644
>> --- a/fs/f2fs/namei.c
>> +++ b/fs/f2fs/namei.c
>> @@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>    	if (test_opt(sbi, INLINE_XATTR))
>>    		set_inode_flag(inode, FI_INLINE_XATTR);
>>    
>> -	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
>> -		set_inode_flag(inode, FI_INLINE_DATA);
>>    	if (f2fs_may_inline_dentry(inode))
>>    		set_inode_flag(inode, FI_INLINE_DENTRY);
>>    
>> @@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>    
>>    	f2fs_init_extent_tree(inode, NULL);
>>    
>> -	stat_inc_inline_xattr(inode);
>> -	stat_inc_inline_inode(inode);
>> -	stat_inc_inline_dir(inode);
>> -
>>    	F2FS_I(inode)->i_flags =
>>    		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
>>    
>> @@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>    			set_compress_context(inode);
>>    	}
>>    
>> +	/* 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);
>> +
>> +	stat_inc_inline_xattr(inode);
>> +	stat_inc_inline_inode(inode);
>> +	stat_inc_inline_dir(inode);
>> +
>>    	f2fs_set_inode_flags(inode);
>>    
>>    	trace_f2fs_new_inode(inode, 0);
>> @@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>>    		if (!is_extension_exist(name, ext[i], false))
>>    			continue;
>>    
>> +		/* Do not use inline_data with compression */
>> +		clear_inode_flag(inode, FI_INLINE_DATA);
> 
> if (is_inode_set_flag()) {
> 	clear_inode_flag();
> 	stat_dec_inline_inode();
> }

Missed to send new version to mailing list?

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=4cde00d50707c2ef6647b9b96b2cb40b6eb24397

Thanks,

> 
> Thanks,
> 
>>    		set_compress_context(inode);
>>    		return;
>>    	}
> 
> 
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [f2fs-dev] [PATCH 1/3] f2fs: attach inline_data after setting compression
  2022-06-22 14:06   ` Chao Yu
@ 2022-06-22 16:52     ` Jaegeuk Kim
  0 siblings, 0 replies; 7+ messages in thread
From: Jaegeuk Kim @ 2022-06-22 16:52 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel, stable

On 06/22, Chao Yu wrote:
> On 2022/6/19 8:35, Chao Yu wrote:
> > On 2022/6/18 6:31, Jaegeuk Kim wrote:
> > > This fixes the below corruption.
> > > 
> > > [345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
> > > 
> > > Cc: <stable@vger.kernel.org>
> > > Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
> > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > > ---
> > >    fs/f2fs/namei.c | 16 ++++++++++------
> > >    1 file changed, 10 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> > > index c549acb52ac4..a841abe6a071 100644
> > > --- a/fs/f2fs/namei.c
> > > +++ b/fs/f2fs/namei.c
> > > @@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
> > >    	if (test_opt(sbi, INLINE_XATTR))
> > >    		set_inode_flag(inode, FI_INLINE_XATTR);
> > > -	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
> > > -		set_inode_flag(inode, FI_INLINE_DATA);
> > >    	if (f2fs_may_inline_dentry(inode))
> > >    		set_inode_flag(inode, FI_INLINE_DENTRY);
> > > @@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
> > >    	f2fs_init_extent_tree(inode, NULL);
> > > -	stat_inc_inline_xattr(inode);
> > > -	stat_inc_inline_inode(inode);
> > > -	stat_inc_inline_dir(inode);
> > > -
> > >    	F2FS_I(inode)->i_flags =
> > >    		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
> > > @@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
> > >    			set_compress_context(inode);
> > >    	}
> > > +	/* 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);
> > > +
> > > +	stat_inc_inline_xattr(inode);
> > > +	stat_inc_inline_inode(inode);
> > > +	stat_inc_inline_dir(inode);
> > > +
> > >    	f2fs_set_inode_flags(inode);
> > >    	trace_f2fs_new_inode(inode, 0);
> > > @@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
> > >    		if (!is_extension_exist(name, ext[i], false))
> > >    			continue;
> > > +		/* Do not use inline_data with compression */
> > > +		clear_inode_flag(inode, FI_INLINE_DATA);
> > 
> > if (is_inode_set_flag()) {
> > 	clear_inode_flag();
> > 	stat_dec_inline_inode();
> > }
> 
> Missed to send new version to mailing list?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=4cde00d50707c2ef6647b9b96b2cb40b6eb24397

I'm testing the new version.

> 
> Thanks,
> 
> > 
> > Thanks,
> > 
> > >    		set_compress_context(inode);
> > >    		return;
> > >    	}
> > 
> > 
> > _______________________________________________
> > Linux-f2fs-devel mailing list
> > Linux-f2fs-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3 v2] f2fs: attach inline_data after setting compression
  2022-06-17 22:31 [PATCH 1/3] f2fs: attach inline_data after setting compression Jaegeuk Kim
  2022-06-19  0:35 ` [f2fs-dev] " Chao Yu
@ 2022-06-22 16:53 ` Jaegeuk Kim
  2022-06-28  7:46   ` [f2fs-dev] " Chao Yu
  1 sibling, 1 reply; 7+ messages in thread
From: Jaegeuk Kim @ 2022-06-22 16:53 UTC (permalink / raw)
  To: linux-kernel, linux-f2fs-devel; +Cc: stable

This fixes the below corruption.

[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix

Cc: <stable@vger.kernel.org>
Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/namei.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index c549acb52ac4..bf00d5057abb 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 	if (test_opt(sbi, INLINE_XATTR))
 		set_inode_flag(inode, FI_INLINE_XATTR);
 
-	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
-		set_inode_flag(inode, FI_INLINE_DATA);
 	if (f2fs_may_inline_dentry(inode))
 		set_inode_flag(inode, FI_INLINE_DENTRY);
 
@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 
 	f2fs_init_extent_tree(inode, NULL);
 
-	stat_inc_inline_xattr(inode);
-	stat_inc_inline_inode(inode);
-	stat_inc_inline_dir(inode);
-
 	F2FS_I(inode)->i_flags =
 		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
 
@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 			set_compress_context(inode);
 	}
 
+	/* 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);
+
+	stat_inc_inline_xattr(inode);
+	stat_inc_inline_inode(inode);
+	stat_inc_inline_dir(inode);
+
 	f2fs_set_inode_flags(inode);
 
 	trace_f2fs_new_inode(inode, 0);
@@ -325,6 +327,9 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
 		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;
 	}
-- 
2.37.0.rc0.104.g0611611a94-goog


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [f2fs-dev] [PATCH 1/3 v2] f2fs: attach inline_data after setting compression
  2022-06-22 16:53 ` [PATCH 1/3 v2] " Jaegeuk Kim
@ 2022-06-28  7:46   ` Chao Yu
  2022-06-28  7:50     ` Chao Yu
  0 siblings, 1 reply; 7+ messages in thread
From: Chao Yu @ 2022-06-28  7:46 UTC (permalink / raw)
  To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel; +Cc: stable

On 2022/6/23 0:53, Jaegeuk Kim wrote:
> This fixes the below corruption.
> 
> [345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
> 
> Cc: <stable@vger.kernel.org>
> Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
>   fs/f2fs/namei.c | 17 +++++++++++------
>   1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> index c549acb52ac4..bf00d5057abb 100644
> --- a/fs/f2fs/namei.c
> +++ b/fs/f2fs/namei.c
> @@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>   	if (test_opt(sbi, INLINE_XATTR))
>   		set_inode_flag(inode, FI_INLINE_XATTR);
>   
> -	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
> -		set_inode_flag(inode, FI_INLINE_DATA);
>   	if (f2fs_may_inline_dentry(inode))
>   		set_inode_flag(inode, FI_INLINE_DENTRY);
>   
> @@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>   
>   	f2fs_init_extent_tree(inode, NULL);
>   
> -	stat_inc_inline_xattr(inode);
> -	stat_inc_inline_inode(inode);
> -	stat_inc_inline_dir(inode);
> -
>   	F2FS_I(inode)->i_flags =
>   		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
>   
> @@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>   			set_compress_context(inode);
>   	}
>   
> +	/* 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);
> +
> +	stat_inc_inline_xattr(inode);
> +	stat_inc_inline_inode(inode);
> +	stat_inc_inline_dir(inode);
> +
>   	f2fs_set_inode_flags(inode);
>   
>   	trace_f2fs_new_inode(inode, 0);
> @@ -325,6 +327,9 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>   		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);

It looks we don't need to dirty inode if there is no inline_data flag.

Thanks,

>   		set_compress_context(inode);
>   		return;
>   	}

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [f2fs-dev] [PATCH 1/3 v2] f2fs: attach inline_data after setting compression
  2022-06-28  7:46   ` [f2fs-dev] " Chao Yu
@ 2022-06-28  7:50     ` Chao Yu
  0 siblings, 0 replies; 7+ messages in thread
From: Chao Yu @ 2022-06-28  7:50 UTC (permalink / raw)
  To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel; +Cc: stable

On 2022/6/28 15:46, Chao Yu wrote:
> On 2022/6/23 0:53, Jaegeuk Kim wrote:
>> This fixes the below corruption.
>>
>> [345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
>>
>> Cc: <stable@vger.kernel.org>
>> Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
>> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
>> ---
>>   fs/f2fs/namei.c | 17 +++++++++++------
>>   1 file changed, 11 insertions(+), 6 deletions(-)
>>
>> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
>> index c549acb52ac4..bf00d5057abb 100644
>> --- a/fs/f2fs/namei.c
>> +++ b/fs/f2fs/namei.c
>> @@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>       if (test_opt(sbi, INLINE_XATTR))
>>           set_inode_flag(inode, FI_INLINE_XATTR);
>> -    if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
>> -        set_inode_flag(inode, FI_INLINE_DATA);
>>       if (f2fs_may_inline_dentry(inode))
>>           set_inode_flag(inode, FI_INLINE_DENTRY);
>> @@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>       f2fs_init_extent_tree(inode, NULL);
>> -    stat_inc_inline_xattr(inode);
>> -    stat_inc_inline_inode(inode);
>> -    stat_inc_inline_dir(inode);
>> -
>>       F2FS_I(inode)->i_flags =
>>           f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
>> @@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>               set_compress_context(inode);
>>       }
>> +    /* 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);
>> +
>> +    stat_inc_inline_xattr(inode);
>> +    stat_inc_inline_inode(inode);
>> +    stat_inc_inline_dir(inode);
>> +
>>       f2fs_set_inode_flags(inode);
>>       trace_f2fs_new_inode(inode, 0);
>> @@ -325,6 +327,9 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>>           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);
> 
> It looks we don't need to dirty inode if there is no inline_data flag.

Oh, it looks set_compress_context() will dirty inode anyway.... :P

Thanks,

> 
> Thanks,
> 
>>           set_compress_context(inode);
>>           return;
>>       }
> 
> 
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-06-28  7:50 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17 22:31 [PATCH 1/3] f2fs: attach inline_data after setting compression Jaegeuk Kim
2022-06-19  0:35 ` [f2fs-dev] " Chao Yu
2022-06-22 14:06   ` Chao Yu
2022-06-22 16:52     ` Jaegeuk Kim
2022-06-22 16:53 ` [PATCH 1/3 v2] " Jaegeuk Kim
2022-06-28  7:46   ` [f2fs-dev] " Chao Yu
2022-06-28  7:50     ` Chao Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).