From: Andrew Morton <akpm@osdl.org>
Date: Thu, 7 Dec 2006 04:32:01 +0000 (-0800)
Subject: [PATCH] balance_pdgat() cleanup
X-Git-Tag: v2.6.20-rc1~145^2^2~346
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e1dbeda60a7ea9e82a908d93c07308d104d50d79;p=linux-2.6-omap-h63xx.git

[PATCH] balance_pdgat() cleanup

Despaghettify balance_pdgat() a bit.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 518540a4a2a..2e97baa3b2a 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1172,11 +1172,12 @@ loop_again:
 			if (!zone_watermark_ok(zone, order, zone->pages_high,
 					       0, 0)) {
 				end_zone = i;
-				goto scan;
+				break;
 			}
 		}
-		goto out;
-scan:
+		if (i < 0)
+			goto out;
+
 		for (i = 0; i <= end_zone; i++) {
 			struct zone *zone = pgdat->node_zones + i;