From 2bdd1738771dcc702d102a73822d77b4f1965067 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 17 May 2010 12:51:03 +0200
Subject: [PATCH] --- yaml --- r: 196831 b: refs/heads/master c:
 69b62d01ec44fe0d505d89917392347732135a4d h: refs/heads/master i:   196829:
 2c465b63e7db57d0ecf81dd982a8f78286a977f6   196827:
 3fa3730062fee7c4207ca3831dfe029d3c16d88f   196823:
 956ff74e9991d850df67b4a2010c9c9b6cb5d278   196815:
 787accdb8f7bf3b9a8004f37c8c828642c611725   196799:
 7ab7562317108770c187b5bf2e8262f99962ba08 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/fs-writeback.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cb26cb6a4f0d..63cb2834b02d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2395e463fefd4aa8b784787e926e9b84e216d14f
+refs/heads/master: 69b62d01ec44fe0d505d89917392347732135a4d
diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c
index 4b37f7cea4dd..760dc8d0b4ff 100644
--- a/trunk/fs/fs-writeback.c
+++ b/trunk/fs/fs-writeback.c
@@ -852,6 +852,12 @@ static long wb_check_old_data_flush(struct bdi_writeback *wb)
 	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))
@@ -947,8 +953,12 @@ int bdi_writeback_task(struct bdi_writeback *wb)
 				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();
 	}