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: remove else in f2fs_write_cache_pages()
Date:   Tue, 21 Mar 2023 01:31:36 +0800
Message-Id: <20230320173137.64413-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?Po13rdLamcn8tcExQtIpZm32zlnbAG2wUrKycQRNmpYdkHNpvn/Qt7v5exUL?=
 =?us-ascii?Q?iLyuDXunEc/mrK3RaXuB6MVSzCHjNVWPKZSawm3+keJ35MPrjdmM+VrxERWG?=
 =?us-ascii?Q?fYr6dNUDMKcxXzqpOjnpwpnCaC5HICoi+/dz/LsI17fJkSQ1cmp3+1JCeYZc?=
 =?us-ascii?Q?9zMXt/CRsxuEiUo+EmLWk9PjyldNUuXyyNwWB72a3Jj0EGVZ6+o+Zpl1/3J8?=
 =?us-ascii?Q?uG0W/A4W++VhIdBAD4q4uAF196oyTsTza5iOIUq69a8iXVaDlEEAJqbIDPAe?=
 =?us-ascii?Q?HDtos8aln1jd/26HuPtdukNMLlNeuTBngmXwIpnKDUEiS3WVjR/W12SS9w9q?=
 =?us-ascii?Q?hglAfHc6mrQJ5HA/Z4kDMJ3xRui5yZoblZ33B9gc3t2UM9jysJQLazH8riAC?=
 =?us-ascii?Q?Oo97A52/coaCBXftz2E98ttUBSsoKQbIrZ60Uiid+0cNgMax89QB4bIY4GNk?=
 =?us-ascii?Q?w6uYNMH48sBY0Fsb+df5xbbynWr37hqH/36QLTVKvsV5wb9BMt14lK2bE/+p?=
 =?us-ascii?Q?2993jLtdwoK5XZgtoQWffmtkfSGKZUgtbXVf3fu9ry6OTdsli80rqGAaLTA+?=
 =?us-ascii?Q?I8FKG1VK7jzpkwhsXJcuRvrLD/lSXp4wz6BwFaTAzPxwp7DoMuQnwu4193uS?=
 =?us-ascii?Q?Hc7HZU7xMhV0Ghy3lNqiS7z0jd22PXpsp5RdRaicst9KiYx43O2d9dwW6fV8?=
 =?us-ascii?Q?nJFqP5pzoDgAlOLyHwLLMI22mkcV75jvzyMIz+IMH8wzFZ8fxNo9UU7Eijqs?=
 =?us-ascii?Q?zr38L9yfNtg9TjBK7ZX7OHpuGVPyEGxHsjRWbYKz4+Z9fAQVfKJtX6OzGOcV?=
 =?us-ascii?Q?aw1LsmaChGFq6/e0lVfz4X6L1Cbi4+k5re3v10isL6WCH7gUQOFI54NJMClI?=
 =?us-ascii?Q?3dqahRP5jCbXt7IdLMrlC6DCQYP6vu/cpekaC4eaHuj0CRLG9gq4sMCdc+Yi?=
 =?us-ascii?Q?lJW6hn92y/NOjbOWORtYhfL0BYqpKZcdjdgMpmzpBCSbcOySGp/rV00KM3EC?=
 =?us-ascii?Q?cBfrH98w55rc7agtG6RrsOFCnpAoQr3pBjSR/6I4DVN/kZZxwcfchbY1oRL4?=
 =?us-ascii?Q?Ww0brKm59CM/OS3ve7ilY6o1mkfIRW0MCMAI+b5bIXiB0KyLbvDRT4WyXX4Y?=
 =?us-ascii?Q?Zw9x91B+6F0YccFqKVgbcjujnMq3PeWfARaziH74m6kgRuYnQ1B2MN+89sQ5?=
 =?us-ascii?Q?RNKrU0o9rp8Aien3vUnTBjgpox9XF9V429SbFt76Nv1NBX+3CdwkNyKaMnvr?=
 =?us-ascii?Q?iZMgOytWxGPY+gOXMEqpfzBSbz5g5/dlDaFA+7fMgzduxOM9YhAGjWgGfpUz?=
 =?us-ascii?Q?C79q40aTlEpcgBJwmVU9L2ES8Wi2vboy2rIeynCoHLQ+dKDjD7GT7d/48nZA?=
 =?us-ascii?Q?OcOyDu7HMGtYWpkPPzsiqlRN3VGKsNBc85VQDEWn60bIW937cA2aO9lBXhcu?=
 =?us-ascii?Q?8cM3/v3FUC7cfMKtvETwsTa8lCpbG+JNSmtT7xFMQTwLLRpi1dU0nFebECWY?=
 =?us-ascii?Q?yTTomA5NWADG9nNCvGsXh3YNM2wtJjLOk7o9qwBR13hO9/JFB8ikvNHq2bJ+?=
 =?us-ascii?Q?1oM6vWaro/rF0rB9Q1CNzexGoNJCb6p3QznVxJlc?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ccc44a12-3dc5-4993-77ac-08db2968fc5d
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 17:31:49.2265
 (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: qJTHQnjj56/gCg8tWwEwLfPMgWaDv8yf87WxG2yl9f6Mllicu09OgwcrRnm/1xNktfziv9yLcFo3n8WnmbNwAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB5385
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

As Christoph Hellwig point out:

	Please avoid the else by doing the goto in the branch.

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

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index bf51e6e4eb64..fa931fb768e7 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3123,12 +3123,9 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
 			}
 
 			if (folio_test_writeback(folio)) {
-				if (wbc->sync_mode != WB_SYNC_NONE)
-					f2fs_wait_on_page_writeback(
-							&folio->page,
-							DATA, true, true);
-				else
+				if (wbc->sync_mode == WB_SYNC_NONE)
 					goto continue_unlock;
+				f2fs_wait_on_page_writeback(&folio->page, DATA, true, true);
 			}
 
 			if (!folio_clear_dirty_for_io(folio))
-- 
2.35.1