aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2009-10-26 19:49:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 10:39:25 -0400
commit58355c7876a0754377c37c8af948b4cd423410e2 (patch)
tree9e49dfe20538307d2c4c8fc92c88432c4298f63b
parent0d0df599f1f11f12d589318bacb59a50fb5c0310 (diff)
congestion_wait(): don't use WRITE
commit 8aa7e847d (Fix congestion_wait() sync/async vs read/write confusion) replace WRITE with BLK_RW_ASYNC. Unfortunately, concurrent mm development made the unchanged place accidentally. This patch fixes it too. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/vmscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 64e438898832..fbb9f6bdad6e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1088,7 +1088,7 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
1088 int lumpy_reclaim = 0; 1088 int lumpy_reclaim = 0;
1089 1089
1090 while (unlikely(too_many_isolated(zone, file, sc))) { 1090 while (unlikely(too_many_isolated(zone, file, sc))) {
1091 congestion_wait(WRITE, HZ/10); 1091 congestion_wait(BLK_RW_ASYNC, HZ/10);
1092 1092
1093 /* We are about to die and free our memory. Return now. */ 1093 /* We are about to die and free our memory. Return now. */
1094 if (fatal_signal_pending(current)) 1094 if (fatal_signal_pending(current))