From 951df69467115b9e1a04333385958d4382b5960c Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Fri, 9 Oct 2009 12:40:42 +0200 Subject: [PATCH] --- yaml --- r: 167438 b: refs/heads/master c: d25105e8911bff1dbd68e387f12901c5b1a15fe8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 3 --- trunk/mm/page-writeback.c | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0fcd3e7c78d7..86fb64e294b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c279598585e4992a41016bb973993ed15888cb3 +refs/heads/master: d25105e8911bff1dbd68e387f12901c5b1a15fe8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 1535f3884b88..074f753f7449 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6720,9 +6720,6 @@ EXPORT_SYMBOL(yield); /* * This task is about to go to sleep on IO. Increment rq->nr_iowait so * that process accounting knows that this is a task in IO wait state. - * - * But don't do that if it is a deliberate, throttling IO wait (this task - * has set its backing_dev_info: the queue against which it should throttle) */ void __sched io_schedule(void) { diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c index a3b14090b1fb..2c5d79236ead 100644 --- a/trunk/mm/page-writeback.c +++ b/trunk/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