Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Yangtao Li <frank.li@vivo.com>
To:     Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>,
        linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Subject: [PATCH] f2fs: compress: do cleanup in f2fs_truncate_partial_cluster()
Date:   Thu, 30 Nov 2023 02:23:10 -0700
Message-Id: <20231130092310.1297336-1-frank.li@vivo.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?TceAfFYlhZ8UhuzYaeMFf4CHk5eA0oelA0hV7kGRYb+0E6hdhbOPG+p9YK68?=
 =?us-ascii?Q?APn4Q8YKGVhErxy2TqJN08PyXRy7b6eEeWCittjvF12NXnpI3ZrquWGyulV9?=
 =?us-ascii?Q?645pL4M5U65Wk4Hl+h2kJ7iFSMvAXyMAyLZ0VVf9UXAxnVE25owmp7ibvnjV?=
 =?us-ascii?Q?3FQkcVRVgHbb/1h/pT5Q38SZDE1Ydp8tuelurFAkfE5mkKqyKAOg9FOz0sl5?=
 =?us-ascii?Q?gVcAQwHMX+tmdG95d8JEWfxv4d8qJi6Xsk5cOooYbWng8K6v/jkiybSRzDNO?=
 =?us-ascii?Q?wZgqJ68eH07FB9Y4IZNpSQJGo3eCYP8psMINSWIfnkp3575aVwFl5x9BqfLV?=
 =?us-ascii?Q?1HsnLwbn8CkQlKOV9yprlGgGNJ5xwFJTsPm+FaeSzTnlgPvsn/0/CS8NGvBL?=
 =?us-ascii?Q?I274SvvueJ4PtIiswBunlVTYHAqC9XmKA/hX1YVrnqro/WurVkCvVyrqOhcC?=
 =?us-ascii?Q?FKFy965VtViFXu+USHR2heR9WEay4GjnZzqTVRKF2+m2PzX1VtCL/77ZpOKC?=
 =?us-ascii?Q?ajOQlDb8m1NWvGuUJ/m9pz80t7t6ZqMbQ2UZ9dyRJXFYZxS2AgxttwUS2S2e?=
 =?us-ascii?Q?yakgakzBb5MsuTS2GWbgwvXBVRBVjPazzW6RIMydkU2aQUs1vCdZA/oMJFJK?=
 =?us-ascii?Q?cx4bzMvFHeSnKxrsH5rUVBszrghkVfACutJ+vBDRoAFCY7qVEee+97QV7caW?=
 =?us-ascii?Q?hnu51P1lnqPM/4x6DGkpwE8uhCJnreRUIjuzRH+dsUxkkh8aEeqqOnO/OBWm?=
 =?us-ascii?Q?906KzBoHgk9wSJPkDQVCQQGCxhWR+10VmrHkPRcnnT4zw5SAssAUbaLI3MCL?=
 =?us-ascii?Q?H3TxF7XTyErAl25Hvo4/r5nUWup7fU1wPXXU0FhgXgnlmfKf/n6ccTqoh+bS?=
 =?us-ascii?Q?g4pYekHMLV05zvmmECRTPl2xrR9R01UEYODHB6daQTfMM9z4xZEri2bkPMrf?=
 =?us-ascii?Q?PWzbFja1wlLL1eiR3kqp56JpmzZ18ZXRmMtazREIl7kCFOUyJfyJzPfAQY4g?=
 =?us-ascii?Q?MXym2tht8EVCFjK7IgxSgmmYKlr16W55Kmu7SSIEp8ta0+TneBCEUycGOGPt?=
 =?us-ascii?Q?+kyv7pTUKIa3HTl3+qLBOqfNWuNHG9tYC51o3D2hylZ3PN+9CbvON/5HjnNI?=
 =?us-ascii?Q?FvwdOT58nc/M0cytakbj3cz5Q+Tl/8G7vqAv0M1eQDbRFQoVK14horiS7mlU?=
 =?us-ascii?Q?nCEdvDvk1Q77IoErOo2UMFpvFt58wSk6ppPehq3vnzmb8v953gpJ62x6yhDw?=
 =?us-ascii?Q?/8KYDjCmKNFgPiUPROtHHqTmPywhf3qZ003IO2W0qAckQulAzfw/hheSKaB3?=
 =?us-ascii?Q?He00S5u9ThQbLOt+tkoCU+v4C7JQqJsJHz6cr4wutN598FkCAJIdU8LCQn64?=
 =?us-ascii?Q?NLqLOhZPCgLC0QC3seo3RAbWO4TDFl7Y1ZQwaNLo/SlxoMPuO8hzJpRiapPu?=
 =?us-ascii?Q?2r0pt33eMqHzoktt3FekbuysjzG0uPkpyq4ewF7yVendU9lht9WmpiFz3n7z?=
 =?us-ascii?Q?9EDT6NsxDKv2+VnH7yvTk68c/9PPLpSs2Ysej02B+/Y6+w5Bhiw5VZ5cPJFW?=
 =?us-ascii?Q?U/pq4l/cFSJGJNpeEzVb7OMnev024XqNHBk+oK2B?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 154a4494-7a47-485f-42ba-08dbf184a2d8
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2023 09:13:37.4295
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gIdQ0hj4mFTT2c17r1/jthdmZXAaEsZHgoRgqjHpSd465wJLdwCAOrApak3MTuJNGrCNqatsKfo64YKOJrYrDQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4068
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 30 Nov 2023 01:14:01 -0800 (PST)

Remove unnecessary code logic.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/compress.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 36e5dab6baae..de55c266509a 100644
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1170,7 +1170,9 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)
 	int log_cluster_size = F2FS_I(inode)->i_log_cluster_size;
 	pgoff_t start_idx = from >> (PAGE_SHIFT + log_cluster_size) <<
 							log_cluster_size;
-	int err;
+	struct page **rpages = fsdata;
+	int cluster_size = F2FS_I(inode)->i_cluster_size;
+	int err, i;
 
 	err = f2fs_is_compressed_cluster(inode, start_idx);
 	if (err < 0)
@@ -1190,25 +1192,19 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)
 	if (err <= 0)
 		return err;
 
-	if (err > 0) {
-		struct page **rpages = fsdata;
-		int cluster_size = F2FS_I(inode)->i_cluster_size;
-		int i;
-
-		for (i = cluster_size - 1; i >= 0; i--) {
-			loff_t start = rpages[i]->index << PAGE_SHIFT;
+	for (i = cluster_size - 1; i >= 0; i--) {
+		loff_t start = rpages[i]->index << PAGE_SHIFT;
 
-			if (from <= start) {
-				zero_user_segment(rpages[i], 0, PAGE_SIZE);
-			} else {
-				zero_user_segment(rpages[i], from - start,
-								PAGE_SIZE);
-				break;
-			}
+		if (from <= start) {
+			zero_user_segment(rpages[i], 0, PAGE_SIZE);
+		} else {
+			zero_user_segment(rpages[i], from - start,
+							PAGE_SIZE);
+			break;
 		}
-
-		f2fs_compress_write_end(inode, fsdata, start_idx, true);
 	}
+
+	f2fs_compress_write_end(inode, fsdata, start_idx, true);
 	return 0;
 }
 
-- 
2.39.0