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 v2] f2fs: cleanup in f2fs_create_flush_cmd_control()
Date:   Tue, 25 Oct 2022 15:56:23 +0800
Message-Id: <20221025075623.7958-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?kayqiZdHoYunMIJX08fPJD0B2XuAYA1laKn3ISNmJlE0vF8gKmQgwloF+IuX?=
 =?us-ascii?Q?A9NFl2IG60hfQdVTv0ZdPyxaFz/XbyXBBKRzxPilc+wmnNgKzsDV4yYuYDNW?=
 =?us-ascii?Q?fNqtSOcKFLfHIQumf3lRmVrH198RTcN7RN6yAokY7zRGszSCgNP05j+JGPv3?=
 =?us-ascii?Q?SSJSOqpistkk7Uoe9gN9DYmm/JTyvxL0LGGdLfQ1xUOHfbP2RlG733FHoP/d?=
 =?us-ascii?Q?QSA9JDcnRcHLNGeUE15MKplokhLeORqYbd7AKsUUBoQrPGabvGE6qNSCSGEr?=
 =?us-ascii?Q?Fm3/OoWywOj9ggy3maAWHgryXBWwBYphQw9oJfj3FCJm4alXdptquozNdm+D?=
 =?us-ascii?Q?DilDaedbVL+9j1wC8RsvzF2RrCRFD5bQ1vvR441NdAM/C929dv9dRMcTHK4d?=
 =?us-ascii?Q?AXD+9NanhQs7WyBHgAHrGqtJRhvBe39Ate9lnj4J9OGLUP8ZhKMpSdjMKLPP?=
 =?us-ascii?Q?+n/UVh6pf/qVmo2r5TbIHx/8QLFbMKWFU7wraxmn1TxPKlPOPceKegu7AKts?=
 =?us-ascii?Q?2mQx3Jt8QxWeMKxXKF5FlGtDA2RzMTsEb/7ee4ObqxW9RwoQLDktR9sRizEE?=
 =?us-ascii?Q?8lSbiRIk/rtLMxyYS2sH2vC0VNY8L5DNr1dHMffg41K488XYqzE4JCo8Ud5b?=
 =?us-ascii?Q?Oule6y2ZHASsSQXQHWGkm0hJ56fSptN6RO016tOo0BQ5oGPFs0hHxa0DGHU8?=
 =?us-ascii?Q?5K+wB8n51FNh63vp1sE74vPac/yaEKPF2EnXCbYaTnG0Gj4Ay3CyR5uCz4f3?=
 =?us-ascii?Q?NZGj7narZp4RdDANKgym6CarOccflyoyB3b06bla/gJxXqI3rhjpX+afHdCe?=
 =?us-ascii?Q?cRV7zXvpITCV7CnbgqUSF5XtJytHrQkME+4S7yltrZS7fcnRUHBCPLaXJ5+M?=
 =?us-ascii?Q?zKKb4PhiBfIRSuqR9dGKZCQok9AbG36uGeqprRg+EE+ND6+qerJ0Vw27QFtj?=
 =?us-ascii?Q?EQm8wcssjiKulM9VNDj+L5IB32GOjbWMfU0XzYa5yiJk8+LsLdD5nvRFF7QP?=
 =?us-ascii?Q?h+PY0hd1aC2Rlvq5up8nw4kZUTOdNon+9MeNNP1n8yVvZufYxXapCXpG05XB?=
 =?us-ascii?Q?/g/0utd2IMfsj6wViDXChWoXFj73n9QJ4ykam+vGMR1QacE/FsUATgIPidUC?=
 =?us-ascii?Q?yWr6Df+TnRc6y6GA2+E9mmdHiJTP943t/VelWw3MjxFImDPszwyd9ZPZGmyc?=
 =?us-ascii?Q?rqDsGp7enwQ1K4455E2l6fBXQPHHGaHzJ+IYzPgJp+75IfdTMp1xYS727ePC?=
 =?us-ascii?Q?UEmX+QIeqz6wgXs3Hxb3KVIW24bxkHXa0EQoRL27fvHB9AL6oks57AyCdAFP?=
 =?us-ascii?Q?fUISMmn1H+4VmpDKHyH21fR8gVoUg0Jj/Tv4rWPUgvC9A6o8943Pn5sEYE/o?=
 =?us-ascii?Q?/vMppKK0DUGMZ8vi5MMS2SiZpK6xu4WnRcRLC5HGEQCtJnl3P8Ei7Tl3DT3+?=
 =?us-ascii?Q?6kULUM5oErqiM75VgRuf27ZcgyFt9SScMjMrMaweNs5mWNc5GjvxOdWNtWDs?=
 =?us-ascii?Q?w5nfT3eNMdZQDLkJ+Qi2QIc3ErL1Sj5LK9TXIt0ZFZ28s2nONTCCsoDPiJMr?=
 =?us-ascii?Q?D/BJ0cnZYiMUpFs4zYu77TwA/4NU0p3R5SmPkQrb?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ae866d2-09e8-4ebe-b3b2-08dab65e6e03
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 07:56:31.7230
 (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: 3HFUeRK/LkCFnKhTeg8bIYrbzK3embcSEeWnrdVUpM4uRO7dvip8HmOqC/PMdLxDZhH7FTa1cK+89DuQE3WZDg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5284
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,URIBL_BLOCKED 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

Remove the local 'err' variable for readable,
no functional changes.

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

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index acf3d3fa4363..ed247195a20c 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -620,12 +620,11 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi)
 {
 	dev_t dev = sbi->sb->s_bdev->bd_dev;
 	struct flush_cmd_control *fcc;
-	int err = 0;
 
 	if (SM_I(sbi)->fcc_info) {
 		fcc = SM_I(sbi)->fcc_info;
 		if (fcc->f2fs_issue_flush)
-			return err;
+			return 0;
 		goto init_thread;
 	}
 
@@ -638,19 +637,18 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi)
 	init_llist_head(&fcc->issue_list);
 	SM_I(sbi)->fcc_info = fcc;
 	if (!test_opt(sbi, FLUSH_MERGE))
-		return err;
+		return 0;
 
 init_thread:
 	fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi,
 				"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
 	if (IS_ERR(fcc->f2fs_issue_flush)) {
-		err = PTR_ERR(fcc->f2fs_issue_flush);
 		kfree(fcc);
 		SM_I(sbi)->fcc_info = NULL;
-		return err;
+		return PTR_ERR(fcc->f2fs_issue_flush);
 	}
 
-	return err;
+	return 0;
 }
 
 void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
-- 
2.25.1