aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-07-09 14:52:32 +0200
committerJens Axboe <axboe@carl.(none)>2009-07-10 20:31:53 +0200
commit8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0 (patch)
tree76c8b4f1362a928d426f2201790ab5d128f57724 /mm/memcontrol.c
parentc2cc49a2f8a479dde96a599646d30b6cc9dbed78 (diff)
downloadkernel_goldelico_gta04-8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0.zip
kernel_goldelico_gta04-8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0.tar.gz
kernel_goldelico_gta04-8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0.tar.bz2
Fix congestion_wait() sync/async vs read/write confusion
Commit 1faa16d22877f4839bd433547d770c676d1d964c accidentally broke the bdi congestion wait queue logic, causing us to wait on congestion for WRITE (== 1) when we really wanted BLK_RW_ASYNC (== 0) instead. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index e2fa20d..e717964 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1973,7 +1973,7 @@ try_to_free:
if (!progress) {
nr_retries--;
/* maybe some writeback is necessary */
- congestion_wait(WRITE, HZ/10);
+ congestion_wait(BLK_RW_ASYNC, HZ/10);
}
}