Prev: [patch 031/164] USB: serial: option: add cinterion device id
Next: [patch 152/164] KVM: MMU: Segregate shadow pages with different cr0.wp
From: Greg KH on 1 Jul 2010 17:00
2.6.33-stable review patch. If anyone has any objections, please let me know.

------------------

From: Jens Axboe <jens.axboe(a)oracle.com>

commit 69b62d01ec44fe0d505d89917392347732135a4d upstream.

Prior to 2.6.32, setting /proc/sys/vm/dirty_writeback_centisecs disabled
periodic dirty writeback from kupdate. This got broken and now causes
excessive sys CPU usage if set to zero, as we'll keep beating on
schedule().

Reported-by: Justin Maggard <jmaggard10(a)gmail.com>
Signed-off-by: Jens Axboe <jens.axboe(a)oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
fs/fs-writeback.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -834,6 +834,12 @@ static long wb_check_old_data_flush(stru
unsigned long expired;
long nr_pages;

+ /*
+ * When set to zero, disable periodic writeback
+ */
+ if (!dirty_writeback_interval)
+ return 0;
+
expired = wb->last_old_flush +
msecs_to_jiffies(dirty_writeback_interval * 10);
if (time_before(jiffies, expired))
@@ -929,8 +935,12 @@ int bdi_writeback_task(struct bdi_writeb
break;
}

- wait_jiffies = msecs_to_jiffies(dirty_writeback_interval * 10);
- schedule_timeout_interruptible(wait_jiffies);
+ if (dirty_writeback_interval) {
+ wait_jiffies = msecs_to_jiffies(dirty_writeback_interval * 10);
+ schedule_timeout_interruptible(wait_jiffies);
+ } else
+ schedule();
+
try_to_freeze();
}



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch 031/164] USB: serial: option: add cinterion device id
Next: [patch 152/164] KVM: MMU: Segregate shadow pages with different cr0.wp