summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-10-09 12:40:42 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-10-09 12:40:42 +0200
commitd25105e8911bff1dbd68e387f12901c5b1a15fe8 (patch)
treebcb94e898b9f3b0322db74473e4dd319a16308e2 /mm
parent8c279598585e4992a41016bb973993ed15888cb3 (diff)
downloadlinux-d25105e8911bff1dbd68e387f12901c5b1a15fe8.tar.gz
linux-d25105e8911bff1dbd68e387f12901c5b1a15fe8.tar.bz2
linux-d25105e8911bff1dbd68e387f12901c5b1a15fe8.zip
writeback: account IO throttling wait as iowait
It makes sense to do IOWAIT when someone is blocked due to IO throttle, as suggested by Kame and Peter. There is an old comment for not doing IOWAIT on throttle, however it has been mismatching the code for a long time. If we stop accounting IOWAIT for 2.6.32, it could be an undesirable behavior change. So restore the io_schedule. CC: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> CC: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/page-writeback.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index a3b14090b1fb..2c5d79236ead 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -566,7 +566,8 @@ static void balance_dirty_pages(struct address_space *mapping,
if (pages_written >= write_chunk)
break; /* We've done our duty */
- schedule_timeout_interruptible(pause);
+ __set_current_state(TASK_INTERRUPTIBLE);
+ io_schedule_timeout(pause);
/*
* Increase the delay for each loop, up to our previous