From 9176b447adc94a1f208c4fdf7fc38c67a51b9f6a Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Fri, 2 Dec 2011 18:21:51 -0600
Subject: [PATCH] --- yaml --- r: 276633 b: refs/heads/master c:
 82e230a07de3812a5e87a27979f033dad59172e3 h: refs/heads/master i:   276631:
 6a9c0d071f3ac264b32a4810d7d68634188aad81 v: v3

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

diff --git a/[refs] b/[refs]
index 0276a7c08f7c..fbe71d5fb408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5c6343c4d75f9d3226e05a72e7861e967fc8099
+refs/heads/master: 82e230a07de3812a5e87a27979f033dad59172e3
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index 17403e3a7c89..50f08241f981 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -989,8 +989,7 @@ static unsigned long bdi_max_pause(struct backing_dev_info *bdi,
 	 *
 	 * 8 serves as the safety ratio.
 	 */
-	if (bdi_dirty)
-		t = min(t, bdi_dirty * HZ / (8 * bw + 1));
+	t = min(t, bdi_dirty * HZ / (8 * bw + 1));
 
 	/*
 	 * The pause time will be settled within range (max_pause/4, max_pause).