---

yaml --- r: 218857 b: refs/heads/master c: b443e73 h: refs/heads/master i: 218855: f9c2cf5 v: v3
git-mirror · Oct 28, 2010 · 67184b5 · 67184b5
1 parent 53a4da5
commit 67184b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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)