---

yaml --- r: 275844 b: refs/heads/master c: 1df6471 h: refs/heads/master v: v3
git-mirror · Nov 17, 2011 · 8b5f7e9 · 8b5f7e9
1 parent c97baab
commit 8b5f7e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 499d05ecf990a7a7bbf9e0a273f9969f8ec69efc
+refs/heads/master: 1df647197c5b8aacaeb58592cba9a1df322c9000
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
@@ -1136,14 +1136,11 @@ static void balance_dirty_pages(struct address_space *mapping,
 		__set_current_state(TASK_KILLABLE);
 		io_schedule_timeout(pause);
 
-		dirty_thresh = hard_dirty_limit(dirty_thresh);
 		/*
-		 * max-pause area. If dirty exceeded but still within this
-		 * area, no need to sleep for more than 200ms: (a) 8 pages per
-		 * 200ms is typically more than enough to curb heavy dirtiers;
-		 * (b) the pause time limit makes the dirtiers more responsive.
+		 * This is typically equal to (nr_dirty < dirty_thresh) and can
+		 * also keep "1000+ dd on a slow USB stick" under control.
 		 */
-		if (nr_dirty < dirty_thresh)
+		if (task_ratelimit)
 			break;
 
 		if (fatal_signal_pending(current))