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 2/2] f2fs: move set_file_temperature into f2fs_new_inode
Date:   Fri, 11 Nov 2022 18:08:30 +0800
Message-Id: <20221111100830.953733-2-shengyong@oppo.com>
In-Reply-To: <20221111100830.953733-1-shengyong@oppo.com>
References: <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?7zeBI5g3YeQPF4DF/RaXB4y48FMDk5xXozC+XwjzLChbomAYQ1vbdxHhbliD?=
 =?us-ascii?Q?d/KO2/JHeCfilj5JsYtIYDYoJNeUKmV/IOv89m82tx4wdWzzYN9ovkWKS2k9?=
 =?us-ascii?Q?AiYiBJApzVA1xsC5UlgRLzI82bXWL3oAizxRQn7y1z5eCxnsMbX+bfJq50u7?=
 =?us-ascii?Q?XTFAUvI10j1eyWxOw5YkgD+sAzdZk13lTo6umA8AUt5gdCF73e+adqVZb1kU?=
 =?us-ascii?Q?rO2yV3bHCYSOkRfpHFm1wfAEceFKrrcgrZ/ou0IIfTkfgneAHu2SPHM7ZRY3?=
 =?us-ascii?Q?b2zrGwJarl50l5mxVjV2XC3ch81r1cdXqemUe1Jgryc6bdJ7ljwcw+1f9gfS?=
 =?us-ascii?Q?yuoNjYHbjNs1tpE03xpQyICAvm63aGT0S92dIWEtcfUqpEYhnyU1+MO3RC6F?=
 =?us-ascii?Q?5crZ/1t33h+RW4hePKMeA1g9etpUjrCzDDx2icyjw1hV+Hp7MfMr2DewWUH8?=
 =?us-ascii?Q?bEuvgnIpOXqqYqZDd09aHMrfoa0r6PH9y/sFp4Ch2CkHh502GoCsrihN2Ap3?=
 =?us-ascii?Q?wIrf5fi1HKqQlcFUd5s8S1/OMg0ITzlkzUrWgnnwLyg28D4alp2Oqdp+ORlq?=
 =?us-ascii?Q?UsoU0dGd1vjKONFi6zeIFx4TfXC6phYeukrAZEFHqMJzzfkjfmOwFnGKiKUJ?=
 =?us-ascii?Q?UFWkkrgUw/xvaSx499mDhjRyRYSE16k3vscRqpSy+Z9llcH7hcv8KiwNwaQw?=
 =?us-ascii?Q?iUQg1XwY09slPDsizbCyQJFC2YleGzkr7FhImY42Yp20YqFc+wHvZPiGzXs9?=
 =?us-ascii?Q?vvUKIn7xgpJ6ZRBzmjbvuxRzfrrHMRjfbwq6IQm+xeJ2Lx542iMDnPLcHZaV?=
 =?us-ascii?Q?iQE8fJGnhDmFnmOTbCwYAS5SEgq2s2lahyTpybR6EXKXYzHHrOl7BlkWINKR?=
 =?us-ascii?Q?2nNE6lwqpCDi2pY472Tppko5hT7iS3FogFnIlh9UqbQ77Hjcq3qmtMoZc3U6?=
 =?us-ascii?Q?4TsJBLVTXaWVP+mozoSau3yCx6t92smko8JdhOJhKrIL9oI71NxihqppMU6f?=
 =?us-ascii?Q?8WsY6QJzCdIqmTdD0UpZy9j8iWgNGCWX1j9QnmzZD2DccKlLIqaw5jR+WTU8?=
 =?us-ascii?Q?GVbd7iitThxZrxOv8nui872pGjzZj2BAaDRxh3M454N2CkQ3CsycjPMk9gtL?=
 =?us-ascii?Q?mZKm1yWTB/KIA18t1/+L9a3YqxK7Ea1xXllp7hYa85AAFt2GAB4Op3DUGSrC?=
 =?us-ascii?Q?Gr220pkctZC7jDQoAj4BwmyDYbQ5p+j6VZsTZdtDaI39TiFOmEPrv9d/wtfD?=
 =?us-ascii?Q?/hdzn9mGOV8c+MVp9Qh60lntXazNehWJ9CzCXhYsH83omj07sYMcYWJhlgdT?=
 =?us-ascii?Q?YrQ94s3Q/7Ppi6LY/tvY6JIcl7am22M206e3Rf7uOYEdepelBS2aRa640Tju?=
 =?us-ascii?Q?qlmaoJxCBOQxNK7YoQnTO2WuX0cQf6A/RF9XOAugMdkBW+dgPLsp1x0bx/me?=
 =?us-ascii?Q?dTWMkJU2FBTquHGt/+qIi9C64yqX46LSIC9ADisS6Z50adH7LH1AHFiK7XFh?=
 =?us-ascii?Q?VgkNv4vfMEEiE7ty/16M3KyT0qiKMIjPQK1ydlI2VfXaXkUtBcOqcPkF18qa?=
 =?us-ascii?Q?7DPCqknJanqH0LWt8s77n2u2ZgpZWj5FuY57cDZM?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d5863c15-af71-428b-1134-08dac3ccbfa6
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:58.4922
 (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: zQHIdZ2XP/W/pBENT11fEA535s5f9F1oy5pAQPyzcAYIeKbPhivUmpDH4nxmXVccTXSp+VDpnusRWC+dvMF/aw==
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

Since the file name has already passed to f2fs_new_inode(), let's
move set_file_temperature() into f2fs_new_inode().

Signed-off-by: Sheng Yong <shengyong@oppo.com>
---
 fs/f2fs/namei.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 36e251f438568..04bc7ec5e29e9 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -131,6 +131,9 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
 	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
 		set_inode_flag(inode, FI_INLINE_DATA);
 
+	if (name && !test_opt(sbi, DISABLE_EXT_IDENTIFY))
+		set_file_temperature(sbi, inode, name);
+
 	stat_inc_inline_xattr(inode);
 	stat_inc_inline_inode(inode);
 	stat_inc_inline_dir(inode);
@@ -357,9 +360,6 @@ static int f2fs_create(struct user_namespace *mnt_userns, struct inode *dir,
 	if (IS_ERR(inode))
 		return PTR_ERR(inode);
 
-	if (!test_opt(sbi, DISABLE_EXT_IDENTIFY))
-		set_file_temperature(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;
-- 
2.25.1