Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sheng Yong <shengyong@oppo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Sheng Yong <shengyong@oppo.com>
Subject: [PATCH v2 1/2] f2fs: fix to enable compress for newly created file if extension matches
Date:   Fri, 11 Nov 2022 18:08:29 +0800
Message-Id: <20221111100830.953733-1-shengyong@oppo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TNr7BtdM/EkOZlm+N5Ydf9/pMz1F7G4zXHmDLmnsTL4SjTcvsrTyUMUD/MUW?=
 =?us-ascii?Q?Qi7+oh1N9EL/XfyteglnJX1ucYBO6rjK1lIOJjkl4ct3UkOObYiFu6qMQeu4?=
 =?us-ascii?Q?hm2RCDj9jd7aTPiW1JeRIO8ZO3pAqHpWjxf5/jqQDpOOBoGoG+5z1o1plPd+?=
 =?us-ascii?Q?ILhRc7T+NzIEwh1zKQHDn3Wxx3XY43JaMN3+9oG7cPpfw6HNFfklyaWc4i3e?=
 =?us-ascii?Q?Mh8Rlqvp8M47A2tpnshZtF7rvKNpwpKsCAh7vkSMuO0vo+ztLKjGTHxQW0m6?=
 =?us-ascii?Q?xb4hOy2rwddYLlglbTNveY5rvQEyb8T5roBxpX2cXVM+bMUb1UtOUIhaUn44?=
 =?us-ascii?Q?HbYciIh7bDqxIG96Dnv9vGYQ1MV/1SXiQrg0XXF14IgmHy4x29WMJgSCMJvG?=
 =?us-ascii?Q?EbfTR5/jvMHwbIpQALT4sY0+4jYnhVzdonwy3XH61rddwGMXpylmu0TU5ReN?=
 =?us-ascii?Q?AIJ0HuYf+GVIqUF++uEXoREnIfFGk2AMdC57xS7OymkuymXa2fn9JMDM9DNx?=
 =?us-ascii?Q?eadG1YD4WeRmk1FH/atmY/30drSRaVYMCt+Vf+gAab8QHlKr47OSCGiVL3Nu?=
 =?us-ascii?Q?vYBIDvl4a2/eRObGXGJisKpLHlpZgPDcmkr8qNjdi3FnMo8lMo0OFJ/X1Ip+?=
 =?us-ascii?Q?PcDAMFJ2c75hJkjBUVHxANlRvwJfPGeIKxEPGzTFbD1FTlO0ju65lJ7Nt3hl?=
 =?us-ascii?Q?tdPfJAGz0Ix65emwsNp6jHdnX+i4hSf9Z71A/a5TZUiNb+JqcNnYZqDGDVYI?=
 =?us-ascii?Q?jkDQ4hO2TKxcAxRAWuqnYc02cvrecHLU2/E0VsAy1CH04ANobkcet109jqaZ?=
 =?us-ascii?Q?F1VTOJgNeOAeC00hPAb3AM91+WEBRvhWb6VKHZTIWz+wlKV/ZpS6aL+Ip5UU?=
 =?us-ascii?Q?46QE5tmTcuiZFOrA9v4wgpZTplNSpwhbbke+cLtOSafNXXEcAuw4kTkHrQ4F?=
 =?us-ascii?Q?DFDs9bNwi2stJn5AIWQUuBhgt9QhSStiw8fVyE0WSpPyuagxEQIDTi1+xzUd?=
 =?us-ascii?Q?cdh8qZLNg8PeTGxkxl36Eh/SoJfyRTBhczGBYiCq2z/26nA96ICphgb0onxw?=
 =?us-ascii?Q?xHDJU1PSktbi22yvuKbiLrtxH/aqVH6YwViMG0P8NK0jIoFvad/rpDo1PLQo?=
 =?us-ascii?Q?WZfGP/5RpeIJOQTgvcv7kbIEAhPi9w1WDh1EXotLpWNI3W3bQcTrRZuxITRZ?=
 =?us-ascii?Q?lQ0QEmqsU92RqcdonU9bbWAWrpae/HxW8LrKutyj6xq5o52nh2V5yTBIQbTg?=
 =?us-ascii?Q?dqMsxfP80gYf1FAVGUCQiibxT5Q1KQEQAH3msA1301iGLZw49kj82RcU/MDZ?=
 =?us-ascii?Q?AkB9yCFRLTbeGjnTOK0MBCGQ+uuckTi7ozLO68nE5MEQXN5iO6Rbn2V3MGvn?=
 =?us-ascii?Q?jAYsiYwQ0NmkLQl6bksjqvGFFa1XCR+ClV868Z5iNmzm0tCzx0JDQssGfvNn?=
 =?us-ascii?Q?iamiD46YxTNd20zEE0+YEvQOHww8EZxlQyKovF5bHQpWjVITfrWX6t5FzD2s?=
 =?us-ascii?Q?SHS1ztrMhP4uhJt2+93x+qRX1iJJlLZjbqTS40pUny72JHfHjXngFeWdaqnr?=
 =?us-ascii?Q?QZkGl5xgrmkEok0JqnaiD3III5y7M8o91iYtnZeg?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c80cbf0b-b008-44ed-b9b1-08dac3ccbeb2
X-MS-Exchange-CrossTenant-AuthSource: SI2PR02MB5148.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 10:08:56.8662
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0D3k/01lkudxfA06Q2b1iVRBhDNSO4rL7dY7stqHBk2NV2+x6ikthZMoNdrin+Y2/agVgpOWJSh4Ie9HhhZi/Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR02MB5901
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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