From f997a8299e217d0fd8be257ebe2b457bfee722a7 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 16 Jun 2009 15:31:44 -0700
Subject: [PATCH] --- yaml --- r: 151519 b: refs/heads/master c:
 dcf975d58565880a134afb13bde511d1b873ce79 h: refs/heads/master i:   151517:
 a7080168a796adc9b16d8ce26d80b8f45ae94dca   151515:
 4177a55443331811e27e6f8752b4f239c04576e0   151511:
 b710231f8499f8e86c831e446ce36a10104b5176   151503:
 c2f91bcf949f2cc85dc52fbd993bb29c7fe56ec0   151487:
 a49d363809c4a0627645b18720b2add5d06c08fe v: v3

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

diff --git a/[refs] b/[refs]
index 25fbfa32589c..6204224aac78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78dc583d3ab43115579cb5f3f7bd12e3548dd5a5
+refs/heads/master: dcf975d58565880a134afb13bde511d1b873ce79
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index bb553c3e955d..7b0dcea4935b 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -265,18 +265,19 @@ static void bdi_writeout_fraction(struct backing_dev_info *bdi,
  * This avoids exceeding the total dirty_limit when the floating averages
  * fluctuate too quickly.
  */
-static void
-clip_bdi_dirty_limit(struct backing_dev_info *bdi, long dirty, long *pbdi_dirty)
+static void clip_bdi_dirty_limit(struct backing_dev_info *bdi,
+		unsigned long dirty, unsigned long *pbdi_dirty)
 {
-	long avail_dirty;
+	unsigned long avail_dirty;
 
-	avail_dirty = dirty -
-		(global_page_state(NR_FILE_DIRTY) +
+	avail_dirty = global_page_state(NR_FILE_DIRTY) +
 		 global_page_state(NR_WRITEBACK) +
 		 global_page_state(NR_UNSTABLE_NFS) +
-		 global_page_state(NR_WRITEBACK_TEMP));
+		 global_page_state(NR_WRITEBACK_TEMP);
 
-	if (avail_dirty < 0)
+	if (avail_dirty < dirty)
+		avail_dirty = dirty - avail_dirty;
+	else
 		avail_dirty = 0;
 
 	avail_dirty += bdi_stat(bdi, BDI_RECLAIMABLE) +
@@ -299,10 +300,10 @@ static inline void task_dirties_fraction(struct task_struct *tsk,
  *
  *   dirty -= (dirty/8) * p_{t}
  */
-static void task_dirty_limit(struct task_struct *tsk, long *pdirty)
+static void task_dirty_limit(struct task_struct *tsk, unsigned long *pdirty)
 {
 	long numerator, denominator;
-	long dirty = *pdirty;
+	unsigned long dirty = *pdirty;
 	u64 inv = dirty >> 3;
 
 	task_dirties_fraction(tsk, &numerator, &denominator);