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 1/2] f2fs: cleanup in f2fs_create_flush_cmd_control() and f2fs_start_gc_thread()
Date:   Thu, 27 Oct 2022 18:24:46 +0800
Message-Id: <20221027102447.75708-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?FqHN4OdCFhrO9kYF7wPOMLHPa3eyZCPbGe8MgxGWmzTCVweYxJ++lqSynY2Z?=
 =?us-ascii?Q?P7Smd2cfSdfuu0f0Qe07lgArSZGr+lHO+GlEQ2Ef2H3KH0bMG6/jnc73JDyi?=
 =?us-ascii?Q?VPG01JH9VyXoabmKLcUNXy2zJNc/dSTU5aOSRRedERGEe+nE3QhYud2Q6ymr?=
 =?us-ascii?Q?8J8EZPZ82ppeE9nSTpTs4j5pJdGYDRkPhA3tSKgo0hwHwP98MkB2z3YG6dDQ?=
 =?us-ascii?Q?u2nl6XssWZD6mhFzINWwbqZsxCmwMa1qApjzpBjlGEWzukRomWd/YTz9Wp2n?=
 =?us-ascii?Q?+VHqs5A7FalvfA/RL7zQv6H2DCcw/RQ+HBE1xrvbORa3EtL5EE6XIvvbibyC?=
 =?us-ascii?Q?dmJOV4FHUgWuJNfdKt/UPAFxiIvltaaFvcdXMZETkOog/Vjr59w0sN7TTb6/?=
 =?us-ascii?Q?rKGhicEQ8C8/rFHv/S0IPGOR+1qzIEZAYWGtgFIf/DgiFti5hMG3s8Zq8dWH?=
 =?us-ascii?Q?jq//h4l+/aOvZolq1PlIbVFT5/HKmwNp3GC02cUjaN7Q55BT2RFl8oN7+wwP?=
 =?us-ascii?Q?OHHfa52YUieo1uGATTDjMPCjJ7Fkx3T9lLP+DG60MzFYOqUeHDp1ZTC9h4LU?=
 =?us-ascii?Q?Lc39s2NvwiaOKaW7k94PLrN2SFgw7XpRwrMvVmDFZJHxCkk7EbuKbY3KWnET?=
 =?us-ascii?Q?zy1VOf5C7e33vEoJPDnxs00vh5JUHf3ha38lYsW2OhEemADnzGZe4xoAyHxl?=
 =?us-ascii?Q?W+H30QjqNrLzM1O7gArHAdP7ftlF5ZWqyxho0qNHwSSOGUmEOGy8DDAGjNMW?=
 =?us-ascii?Q?Jo4HFPyb7S5XLn+szPfX+4GXHo9SVZU0NcGTwc0pglmlXGjgXiyV0AylIb5c?=
 =?us-ascii?Q?Su9iRTR6thDqbiW8doKgDn7Up6eobgm+igXp5dHtjv+CQN1ZXOqdlbRPWv6Q?=
 =?us-ascii?Q?DBvUwT2bvOqb4X0gZdeaxk7f/NojusZVyZtKDIbqApp/KREYcko5E4LaWpY2?=
 =?us-ascii?Q?9Vc8sQlAzYbGozQGVSXT6Gcf5kDvHzCd/VkzDHu9zVWvq2fyZEfKL82HYGOr?=
 =?us-ascii?Q?8vvAEqGB5wYht2KJ/tp+DJnabGjTMYhkl7L3rR+UJMuyZukMUe8QE4YvOmer?=
 =?us-ascii?Q?29RgDrc8tQKuAcqSEgQ8cgzYObqRJW703cQ7YLNEc8zhdXITAAEC4l73Yvqw?=
 =?us-ascii?Q?DwLauseDIieME1WzcLw1UoX9lcjBu991Pq49bpDt/4St8WcQPF4mCNKJKMY7?=
 =?us-ascii?Q?KLaV0gCjrOaNjME2Nrz/ITcjziEDmqTbCECaxOj0emvU7JsmWBfAhVdGovw4?=
 =?us-ascii?Q?XPGT1jpGFry9TFtuXCHVpjGa4MwUxb57C6dq0ZJR9UKJBQMDJtMyWu7ju88g?=
 =?us-ascii?Q?srPHlRWB8m3e+N580kIk0AiFeknmfB/x+53+V48M+V3NGpUZ91JAxJORrTfd?=
 =?us-ascii?Q?aGGieBTqOV6hfzrQ6VyA5gyyNZoX2JHodXfIEU4+v7f3UoiJVmaAaZ2p7Pnz?=
 =?us-ascii?Q?jJ9V7qXDcFTVBhR75iQ49gavGoA20rNa6SWrO/+BuhyVvIJqEqaVFT2y7Fl6?=
 =?us-ascii?Q?4JpU7bmjFd5gqAcNo00UUPjiJ+OVy9IDFK3ELTSCI8ctNBLfpzi1PYTmHHRr?=
 =?us-ascii?Q?DvUcg45ukfv5k0aPOAzVhSiafEDXC5mZIHrvyCsl?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 562a7ef8-a81b-4f92-6f5d-08dab80582d2
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 10:25:03.7710
 (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: HcczFp8YSZQ4Y+RxPA4Z73i+bJHvtr5nfIuAFRBn2bI8D4qclUPYSQVj28G6B612wil5lyxwK/XqKL1nu8gBFw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5123
X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL,SPF_HELO_PASS,SPF_PASS
        autolearn=no 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

Just cleanup for readable, no functional changes.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/gc.c      | 14 ++++++--------
 fs/f2fs/segment.c |  3 +--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 674a905063db..85d16f4106de 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -171,13 +171,10 @@ int f2fs_start_gc_thread(struct f2fs_sb_info *sbi)
 {
 	struct f2fs_gc_kthread *gc_th;
 	dev_t dev = sbi->sb->s_bdev->bd_dev;
-	int err = 0;
 
 	gc_th = f2fs_kmalloc(sbi, sizeof(struct f2fs_gc_kthread), GFP_KERNEL);
-	if (!gc_th) {
-		err = -ENOMEM;
-		goto out;
-	}
+	if (!gc_th)
+		return -ENOMEM;
 
 	gc_th->urgent_sleep_time = DEF_GC_THREAD_URGENT_SLEEP_TIME;
 	gc_th->min_sleep_time = DEF_GC_THREAD_MIN_SLEEP_TIME;
@@ -192,12 +189,13 @@ int f2fs_start_gc_thread(struct f2fs_sb_info *sbi)
 	sbi->gc_thread->f2fs_gc_task = kthread_run(gc_thread_func, sbi,
 			"f2fs_gc-%u:%u", MAJOR(dev), MINOR(dev));
 	if (IS_ERR(gc_th->f2fs_gc_task)) {
-		err = PTR_ERR(gc_th->f2fs_gc_task);
+		int err = PTR_ERR(gc_th->f2fs_gc_task);
 		kfree(gc_th);
 		sbi->gc_thread = NULL;
+		return err;
 	}
-out:
-	return err;
+
+	return 0;
 }
 
 void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 282616e6852a..becceee8e337 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -638,7 +638,6 @@ 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;
 
 	if (SM_I(sbi)->fcc_info) {
 		fcc = SM_I(sbi)->fcc_info;
@@ -662,7 +661,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi)
 	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);
+		int err = PTR_ERR(fcc->f2fs_issue_flush);
 		kfree(fcc);
 		SM_I(sbi)->fcc_info = NULL;
 		return err;
-- 
2.25.1