No one is calling wb_writeback and write_cache_pages with wbc.nonblocking=1 any more. And lumpy pageout will want to do nonblocking writeback without the congestion wait. CC: Steven Whitehouse Signed-off-by: Wu Fengguang --- fs/gfs2/aops.c | 10 ---------- 1 file changed, 10 deletions(-) --- linux.orig/fs/gfs2/aops.c 2009-11-06 09:22:35.000000000 +0800 +++ linux/fs/gfs2/aops.c 2009-11-06 09:52:15.000000000 +0800 @@ -313,11 +313,6 @@ static int gfs2_write_jdata_pagevec(stru if (ret || (--(wbc->nr_to_write) <= 0)) ret = 1; - if (wbc->nonblocking && bdi_write_congested(bdi)) { - wbc->encountered_congestion = 1; - ret = 1; - } - } gfs2_trans_end(sdp); return ret; @@ -348,11 +343,6 @@ static int gfs2_write_cache_jdata(struct int scanned = 0; int range_whole = 0; - if (wbc->nonblocking && bdi_write_congested(bdi)) { - wbc->encountered_congestion = 1; - return 0; - } - pagevec_init(&pvec, 0); if (wbc->range_cyclic) { index = mapping->writeback_index; /* Start from prev offset */ -- 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/