X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Fpage-writeback.c;h=2d30e2cfe8047606064f117fbaca4675540e00dd;hb=7431105b143098c3fc0ced8f9974b792f76198d7;hp=61119b8a11e6d37bb90a6446dd4b44c7c408c161;hpb=a804552b9a15c931cfc2a92a2e0aed1add8b580a;p=~andy%2Flinux

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 61119b8a11e..2d30e2cfe80 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -205,7 +205,8 @@ static unsigned long zone_dirtyable_memory(struct zone *zone)
 	nr_pages = zone_page_state(zone, NR_FREE_PAGES);
 	nr_pages -= min(nr_pages, zone->dirty_balance_reserve);
 
-	nr_pages += zone_reclaimable_pages(zone);
+	nr_pages += zone_page_state(zone, NR_INACTIVE_FILE);
+	nr_pages += zone_page_state(zone, NR_ACTIVE_FILE);
 
 	return nr_pages;
 }
@@ -258,7 +259,8 @@ static unsigned long global_dirtyable_memory(void)
 	x = global_page_state(NR_FREE_PAGES);
 	x -= min(x, dirty_balance_reserve);
 
-	x += global_reclaimable_pages();
+	x += global_page_state(NR_INACTIVE_FILE);
+	x += global_page_state(NR_ACTIVE_FILE);
 
 	if (!vm_highmem_is_dirtyable)
 		x -= highmem_dirtyable_memory(x);