From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 6 Jan 2009 22:39:11 +0000 (-0800)
Subject: mm: write_cache_pages more terminate quickly
X-Git-Tag: v2.6.27.13~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cef443310ed7e6317b19b94628c968aa210ce17;p=thirdparty%2Fkernel%2Fstable.git

mm: write_cache_pages more terminate quickly

commit 82fd1a9a8ced9607312b54859572bcc6211e8919 upstream.

Now that we have the early-termination logic in place, it makes sense to
bail out early in all other cases where done is set to 1.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 0f225bf6b8ed1..8875822d105e5 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -987,12 +987,15 @@ continue_unlock:
 
 			if (wbc->sync_mode == WB_SYNC_NONE) {
 				wbc->nr_to_write--;
-				if (wbc->nr_to_write <= 0)
+				if (wbc->nr_to_write <= 0) {
 					done = 1;
+					break;
+				}
 			}
 			if (wbc->nonblocking && bdi_write_congested(bdi)) {
 				wbc->encountered_congestion = 1;
 				done = 1;
+				break;
 			}
 		}
 		pagevec_release(&pvec);