[186/212] mm/vmscan: add 'else' to remove check_pending label

Commit Message

Andrew Morton Sept. 2, 2021, 9:59 p.m. UTC

From: Miaohe Lin <[e-mail]>
Subject: mm/vmscan: add 'else' to remove check_pending label

We could add 'else' to remove the somewhat odd check_pending label to make
code core succinct.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Miaohe Lin <[e-mail]>
Acked-by: Michal Hocko <[e-mail]>
Cc: Alex Shi <[e-mail]>
Cc: Alistair Popple <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: Hillf Danton <[e-mail]>
Cc: Jens Axboe <[e-mail]>
Cc: Johannes Weiner <[e-mail]>
Cc: John Hubbard <[e-mail]>
Cc: Joonsoo Kim <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Cc: Minchan Kim <[e-mail]>
Cc: Shaohua Li <[e-mail]>
Cc: Vlastimil Babka <[e-mail]>
Cc: Yu Zhao <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/vmscan.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Patch

--- a/mm/vmscan.c~mm-vmscan-add-else-to-remove-check_pending-label
+++ a/mm/vmscan.c
@@ -3578,18 +3578,14 @@  static bool throttle_direct_reclaim(gfp_
 	 * blocked waiting on the same lock. Instead, throttle for up to a
 	 * second before continuing.
 	 */
-	if (!(gfp_mask & __GFP_FS)) {
+	if (!(gfp_mask & __GFP_FS))
 		wait_event_interruptible_timeout(pgdat->pfmemalloc_wait,
 			allow_direct_reclaim(pgdat), HZ);
+	else
+		/* Throttle until kswapd wakes the process */
+		wait_event_killable(zone->zone_pgdat->pfmemalloc_wait,
+			allow_direct_reclaim(pgdat));
 
-		goto check_pending;
-	}
-
-	/* Throttle until kswapd wakes the process */
-	wait_event_killable(zone->zone_pgdat->pfmemalloc_wait,
-		allow_direct_reclaim(pgdat));
-
-check_pending:
 	if (fatal_signal_pending(current))
 		return true;