rely on accurate dirty page accounting to provide enough push back Signed-off-by: Peter Zijlstra --- Index: linux-2.6-mm/include/linux/writeback.h =================================================================== --- linux-2.6-mm.orig/include/linux/writeback.h 2007-04-05 13:23:51.000000000 +0200 +++ linux-2.6-mm/include/linux/writeback.h 2007-04-05 13:24:11.000000000 +0200 @@ -84,7 +84,6 @@ static inline void wait_on_inode(struct int wakeup_pdflush(long nr_pages); void laptop_io_completion(void); void laptop_sync_completion(void); -void throttle_vm_writeout(gfp_t gfp_mask); extern struct timer_list laptop_mode_wb_timer; static inline int laptop_spinned_down(void) Index: linux-2.6-mm/mm/page-writeback.c =================================================================== --- linux-2.6-mm.orig/mm/page-writeback.c 2007-04-05 13:23:51.000000000 +0200 +++ linux-2.6-mm/mm/page-writeback.c 2007-04-05 13:24:38.000000000 +0200 @@ -437,37 +437,6 @@ void balance_dirty_pages_ratelimited_nr( } EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr); -void throttle_vm_writeout(gfp_t gfp_mask) -{ - long background_thresh; - long dirty_thresh; - - if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO)) { - /* - * The caller might hold locks which can prevent IO completion - * or progress in the filesystem. So we cannot just sit here - * waiting for IO to complete. - */ - congestion_wait(WRITE, HZ/10); - return; - } - - for ( ; ; ) { - get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL); - - /* - * Boost the allowable dirty threshold a bit for page - * allocators so they don't get DoS'ed by heavy writers - */ - dirty_thresh += dirty_thresh / 10; /* wheeee... */ - - if (global_page_state(NR_UNSTABLE_NFS) + - global_page_state(NR_WRITEBACK) <= dirty_thresh) - break; - congestion_wait(WRITE, HZ/10); - } -} - /* * writeback at least _min_pages, and keep writing until the amount of dirty * memory is less than the background threshold, or until we're all clean. Index: linux-2.6-mm/mm/vmscan.c =================================================================== --- linux-2.6-mm.orig/mm/vmscan.c 2007-04-03 12:17:57.000000000 +0200 +++ linux-2.6-mm/mm/vmscan.c 2007-04-05 13:24:03.000000000 +0200 @@ -1047,8 +1047,6 @@ static unsigned long shrink_zone(int pri } } - throttle_vm_writeout(sc->gfp_mask); - atomic_dec(&zone->reclaim_in_progress); return nr_reclaimed; } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/