From 67184b597bc917bd667d4a6403f8b14e08a71b14 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Wed, 27 Oct 2010 21:30:03 -0400
Subject: [PATCH] --- yaml --- r: 218857 b: refs/heads/master c:
 b443e7339aa08574d30b0819b344618459c76214 h: refs/heads/master i:   218855:
 f9c2cf562fa6b096f621868885109e4699dcc467 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 63ca8eefeb95..c16df33c4d16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 659c6009ca2e3a01acc9881bafe5f55ef09c965b
+refs/heads/master: b443e7339aa08574d30b0819b344618459c76214
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index d88ba4a9effa..50f3bba68a25 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -3004,9 +3004,12 @@ static int ext4_da_writepages(struct address_space *mapping,
 	 * sbi->max_writeback_mb_bump whichever is smaller.
 	 */
 	max_pages = sbi->s_max_writeback_mb_bump << (20 - PAGE_CACHE_SHIFT);
-	if (!range_cyclic && range_whole)
-		desired_nr_to_write = wbc->nr_to_write * 8;
-	else
+	if (!range_cyclic && range_whole) {
+		if (wbc->nr_to_write == LONG_MAX)
+			desired_nr_to_write = wbc->nr_to_write;
+		else
+			desired_nr_to_write = wbc->nr_to_write * 8;
+	} else
 		desired_nr_to_write = ext4_num_dirty_pages(inode, index,
 							   max_pages);
 	if (desired_nr_to_write > max_pages)