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:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH] f2fs: introduce sanity_check_blocks()
Date:   Thu, 12 Jan 2023 22:22:13 +0800
Message-Id: <20230112142213.22784-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?e0tBtrDnnocBr5vuvXgM6apR7lFDuutfLZMYp4pvgRJPM4dIftFkHWwKBOnM?=
 =?us-ascii?Q?pm7Rfx/iJVdwgl8EfQLCPNSSY8+ejztman6CAnS9Jn3CwJe57PcdkZQpvG+d?=
 =?us-ascii?Q?tBcCaxRHpeRv5GQStxGhgzKEUWsNYlD3uOhhYNf+tvJMMtTLqayBiAjRcnRF?=
 =?us-ascii?Q?ttKt80entT44JB3oXC+/iECgoxUdU6P8H+j2XYPLibulIkR6OgjE4p/dX0ab?=
 =?us-ascii?Q?xoV5BZiF034dHv3hxL2TKtUihHoSe7SbYNg70f3019qT+c0ZTSCj3F6N8mK3?=
 =?us-ascii?Q?Ce3YGJO69HmnTCbGDiSLXSW/XmoQFa+U79JDOvraxHdRRUYeqpzMgponDWAd?=
 =?us-ascii?Q?y9VWVUxCw7h0FxaZ4LOP74YeaNgRW1fB8QHl84WCmzlwl0XMJXaNzFrJ8SIu?=
 =?us-ascii?Q?tMLZ2CsIWTFPvegZ0wo+xuD86+oCej/RjbqlS+eu34j6xthO/pVJmUc16dHZ?=
 =?us-ascii?Q?QFmgy8ZvxUZx0ZybmDx/gVteuqL2IUNoPaqBQoN/HmbUQmVyVRDZ/bK9hnLm?=
 =?us-ascii?Q?I1TjLz0W2oMVgGr9yU505n1TKZozP54US7lg2oR7xRzltbkvPKzeksRndQXg?=
 =?us-ascii?Q?ey062fNbtQLQKD2MRPFF089N4mENRqHQLkCm8TxSXmkmvaa5NQT1dUdMy5uK?=
 =?us-ascii?Q?dEaskFU3i8XBXbE/3Sm9qBy0i6f0+AvBkv2sKVhhtW2pPgrAV0gl+Wq9vc/R?=
 =?us-ascii?Q?ewmjqrY9yN9s9qLYGDT4EBHotRtalc3iq9T/LyWxIKOCvIiRdiVfT4Pihdis?=
 =?us-ascii?Q?eO3cDxy1xsiZnElpa516N1m+oBFMB6y/5V4uThY0nHtHj5wUbPn6cxmHSfUf?=
 =?us-ascii?Q?ShFnDKgiB8gAkIHCCTJZimzxto95aZO/BBrFpScD5GmWwhwE+r22FY/l2Kr9?=
 =?us-ascii?Q?4nC+v7inO/bq9yl6ZW2JKka9H7Pe/EgltE2T3JbOw+483Uale8qvbAl1leWM?=
 =?us-ascii?Q?5irX1Td/mKDlGuKOKNjB97J7vzcjKvSrpFxTlZOE2z1vQpzH04CKp5qyvcDU?=
 =?us-ascii?Q?ifEmpoCngONoi+XQcCLYpKRN4W9mdlbKxFzQmKKmmSi7EWNONigtQmlwJrTd?=
 =?us-ascii?Q?H4galahnj82XhJOF3sm5QulOY+749R7YsqtXY/p/Ylil9wclAqhj5mJNNpAn?=
 =?us-ascii?Q?yWmS2QdcYi5ehQyQTAQAfLjV4R4jnilAkB+wp4Cnw33S9wHs5I8HDk7YVosv?=
 =?us-ascii?Q?OyQYWq5iBWhQQG++R0rw3N9U0wwqLe5L8VHFbxXIdam590ImJHAK2BFxi3XG?=
 =?us-ascii?Q?NizyznxMTzz0c+sSamvdcUI/3qIiMXbFZZqMwNturP7Z6tvhYA1l3dRTHZj5?=
 =?us-ascii?Q?9WAOYZ9irfuarqs/I/8hLsM+5l3EE05OUoqhj/29wHtZx4gQjcK+7vdB0uCI?=
 =?us-ascii?Q?c8tjKo8XdnsRuDTVtI9BKhV02nemR/4ATnGdRJRhQyc4+K9u+APnR7itNrNw?=
 =?us-ascii?Q?g3V6zt0quZ1YEIAEe+Gn8bmc9JVHzbkt7Vg55dQFOv2WJI4+s8FKrKi5Ou8J?=
 =?us-ascii?Q?RKMUPCc2zF2KfrIbnw2ac0e4gIgFBEHR1gA5bW5yG8BLMqzkFdZNHD0eVN+8?=
 =?us-ascii?Q?w8erzddnlM4D2R0qtl+xaEo7AkrA/vfBSY0z5zWM?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8afcba88-d3ab-47e1-1304-08daf4a86ba3
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2023 14:22:22.5597
 (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: kXsS5MxDRDq/0Ydn2J0e+/AsaBpDQpSgcBOsWdgSBxre8FVmvJ6qc3HDZzhUCSlRNTddxEkRhkNcczewW4fMwg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB3903
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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

There are very similar codes in release_compress_blocks() and
reserve_compress_blocks() which is used for data blocks check.

This patch introduces a new helper sanity_check_blocks()
to include those common codes, and used it instead for cleanup.

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

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f5c1b7814954..0d539155379c 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3369,11 +3369,9 @@ static int f2fs_get_compress_blocks(struct file *filp, unsigned long arg)
 	return put_user(blocks, (u64 __user *)arg);
 }
 
-static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
+static int sanity_check_blocks(struct dnode_of_data *dn, pgoff_t count)
 {
 	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
-	unsigned int released_blocks = 0;
-	int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
 	block_t blkaddr;
 	int i;
 
@@ -3390,6 +3388,21 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
 		}
 	}
 
+	return 0;
+}
+
+static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
+{
+	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
+	unsigned int released_blocks = 0;
+	int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
+	block_t blkaddr;
+	int i, rc;
+
+	rc = sanity_check_blocks(dn, count);
+	if (rc)
+		return rc;
+
 	while (count) {
 		int compr_blocks = 0;
 
@@ -3539,20 +3552,11 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
 	unsigned int reserved_blocks = 0;
 	int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
 	block_t blkaddr;
-	int i;
+	int i, rc;
 
-	for (i = 0; i < count; i++) {
-		blkaddr = data_blkaddr(dn->inode, dn->node_page,
-						dn->ofs_in_node + i);
-
-		if (!__is_valid_data_blkaddr(blkaddr))
-			continue;
-		if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr,
-					DATA_GENERIC_ENHANCE))) {
-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
-			return -EFSCORRUPTED;
-		}
-	}
+	rc = sanity_check_blocks(dn, count);
+	if (rc)
+		return rc;
 
 	while (count) {
 		int compr_blocks = 0;
-- 
2.25.1