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: make __queue_discard_cmd() return void
Date:   Thu, 17 Nov 2022 01:10:45 +0800
Message-Id: <20221116171045.13407-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?bfT9vgy08V16FHVcm47xyxc/3LLjQAXgpmgOr/6L2bz/UUO5oHypeYnT/ud+?=
 =?us-ascii?Q?HClY7D4WyPIYbKLQs51UxArDokSeb5TeVLMXqaP3ugB7Qfl1yCaVKOWknKmj?=
 =?us-ascii?Q?LGauJ86GkWinYhipdiYVvhFXxz/Yxpgh4Sov1hcimJzzNTd5xF9vsIHUt0oj?=
 =?us-ascii?Q?3ZL+spzPJzzfg2PY98rsNRDIjpJnqPlw20t7MsIdeABDoQ/6Z0gEuyY4uEXr?=
 =?us-ascii?Q?dQq4hpcgn6+o0DYLX9AhpNCUXeAFZinlOGQtDfW+RRT0/lb07XGJapG1cYn5?=
 =?us-ascii?Q?JOg4Bx5x8IUn+AdHzki+eRN09oUT0X5SMTOGf4p6zA+JoaLq7o97Co70HXPD?=
 =?us-ascii?Q?qynprBJrvyokf84K0w2jResGgJYIBDANbnRsmdCX700PjizxzcOv2bEAUJSF?=
 =?us-ascii?Q?bXXP2j0/8QVSxIPGo22rAL2QsxXI5967MxfU3ItRguuiwcO/LaJ28SC15SZM?=
 =?us-ascii?Q?mJ3LiWn3KQq6XfoEwDcpkB070spxPLeXxAcw3Oe4dz7UnitBYwEsMqJXU3HW?=
 =?us-ascii?Q?YJMyIgmzpUC4OAV7xf72+HFDHiTlb+ArfF12xtcrj+zq734f36rzDH2nCfzP?=
 =?us-ascii?Q?e5QXUPun9VNdI/RQS3fQWiVGBc1hJbbOHElclUD7yDoTEtdwKIlK53kLU6Pr?=
 =?us-ascii?Q?j8wuu5MVtunpkiNNkjrCJLAWPuyUI/XZMbxNIXG+2DHp9Z85hsYM1RKCcr8z?=
 =?us-ascii?Q?zVCHbZljwSXYbah/8PZo+tNOmf2irgoUL6u6Amg9olO4Q9HOPhgrX2X7PUuW?=
 =?us-ascii?Q?niwlacXp0pRroDSmvIDCQGwupY4sN6ex0rEDNYwPqRF6lPdf/ZiixY5DSUJp?=
 =?us-ascii?Q?TdnwU80agykzLw2EB+xpiqgzaTN6s9jCAyFurktzNAQwpdWfYTsRdI4t9z72?=
 =?us-ascii?Q?m0SBRAm5d69OskiQHih+tGhrLfcPF4mejyWPBgmNTI8ZtOzT+ZyQMnhpHyV+?=
 =?us-ascii?Q?vwEgp0Es04LqVJrWrNNuD50bU5zUPzFxmQ55EQ7anyppFMJsaAGG9DJwLKx4?=
 =?us-ascii?Q?b6LD+WlPbaHwzCQJCEb6v7DidKnmmmBPs/dUBnaAFzMX6KqIuzTpvcGtoCON?=
 =?us-ascii?Q?b06C3VhULaE7rcHj3Z32aRB0mAElaHYKxkEFXOis8fOzSrv3Rai2FwW8Klqf?=
 =?us-ascii?Q?ibIOHMH3ekY9OrXHOLDc3gxqFxSY8UiPIUym6FNyuIKqyZ7DCeywR9mATTXN?=
 =?us-ascii?Q?no66YiZJYyAseGSZC+Vw+V+o0bl8vzI+Q2s+afoRb+BVG/0rUrnQJJhO7VxV?=
 =?us-ascii?Q?wOQEQLM4Nb6q2jZMXQLc09+4Zzi2SA0yYbei+n0X4u8iuD0GZBPs/jfX2iiB?=
 =?us-ascii?Q?zTdlbTmmJ49tjvulQ8sbhi3cPRZNsGej1NVFb0ADOtB59K+S1RhpY27T1+6W?=
 =?us-ascii?Q?LcI0yHOWkoUVxm0SKBUNyIWf7LDew+4wLQ+kHKFsLXbfnH3coVu5pbkuCKFC?=
 =?us-ascii?Q?hrlx0qzJ1rIA2BWNSvPopyLocxJHJidT8c7G7bk1FrRY47GI+wR5FuEx3q7V?=
 =?us-ascii?Q?niyijtSZGIGeQT2oPLqgOfJUa4GprhS8NqEJlJ6/pUCTZsWS6MkUikQ5QFz7?=
 =?us-ascii?Q?NMZzkhG4uzWzPI/b8etYgNrQ+nfMZP2HwIf9qkce?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6edbda3d-be9b-419f-3d16-08dac7f59e79
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 17:11:36.8037
 (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: GFDyq+W47AzbzO3lBfwbQAuwdrclBAn2eG6EjMMx6RqcPY1OdwOXivLKsanLmvsuHRQ7o/7LCs08FTKDPxncQA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5867
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 __queue_discard_cmd() never returns an error,
let's make it return void.

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

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8b0b76550578..14ece4bf7c7e 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1358,13 +1358,13 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi,
 	}
 }
 
-static int __queue_discard_cmd(struct f2fs_sb_info *sbi,
+static void __queue_discard_cmd(struct f2fs_sb_info *sbi,
 		struct block_device *bdev, block_t blkstart, block_t blklen)
 {
 	block_t lblkstart = blkstart;
 
 	if (!f2fs_bdev_support_discard(bdev))
-		return 0;
+		return;
 
 	trace_f2fs_queue_discard(bdev, blkstart, blklen);
 
@@ -1376,7 +1376,6 @@ static int __queue_discard_cmd(struct f2fs_sb_info *sbi,
 	mutex_lock(&SM_I(sbi)->dcc_info->cmd_lock);
 	__update_discard_tree_range(sbi, bdev, lblkstart, blkstart, blklen);
 	mutex_unlock(&SM_I(sbi)->dcc_info->cmd_lock);
-	return 0;
 }
 
 static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
@@ -1776,7 +1775,8 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
 	}
 
 	/* For conventional zones, use regular discard if supported */
-	return __queue_discard_cmd(sbi, bdev, lblkstart, blklen);
+	__queue_discard_cmd(sbi, bdev, lblkstart, blklen);
+	return 0;
 }
 #endif
 
@@ -1787,7 +1787,8 @@ static int __issue_discard_async(struct f2fs_sb_info *sbi,
 	if (f2fs_sb_has_blkzoned(sbi) && bdev_is_zoned(bdev))
 		return __f2fs_issue_discard_zone(sbi, bdev, blkstart, blklen);
 #endif
-	return __queue_discard_cmd(sbi, bdev, blkstart, blklen);
+	__queue_discard_cmd(sbi, bdev, blkstart, blklen);
+	return 0;
 }
 
 static int f2fs_issue_discard(struct f2fs_sb_info *sbi,
-- 
2.25.1