f2fs: don't convert inline inode when inline_data option is disable

PATCH New Chao Yu 1 participant 1 message Dec 23, 2015 F2FS file system

Share & tools

Chao Yu

author

2015-12-23 09:52 UTC #0 lore raw

PATCH 2/2 f2fs: don't convert inline inode when inline_data option is disable

If inline_data option is disable, when truncating an inline inode with size which is not exceed maxinum inline size, we should not convert inline inode to regular one to avoid the overhead of synchronizing conversion.

Signed-off-by Chao Yu <[email protected]>

---
 fs/f2fs/inline.c | 3 ---
 fs/f2fs/namei.c  | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

fs/f2fs/inline.c +0 -3

index c24e5d9..5ffbd16 100644
@@ -16,9 +16,6 @@
 
 bool f2fs_may_inline_data(struct inode *inode)
 {
-	if (!test_opt(F2FS_I_SB(inode), INLINE_DATA))
-		return false;
-
 	if (f2fs_is_atomic_file(inode))
 		return false;

fs/f2fs/namei.c +1 -1

index 8d2616f..8655dc8 100644
@@ -60,7 +60,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
 	if (f2fs_encrypted_inode(dir) && f2fs_may_encrypt(inode))
 		f2fs_set_encrypted_inode(inode);
 
-	if (f2fs_may_inline_data(inode))
+	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
 		set_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
 	if (f2fs_may_inline_dentry(inode))
 		set_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY);

Signature · 1 line

2.6.3