On Thu, Nov 19, 2009 at 05:27:55AM +0800, Dave Chinner wrote: > On Wed, Nov 18, 2009 at 04:26:55PM +0800, Wu Fengguang wrote: > > 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. > > .... > > > --- linux.orig/fs/xfs/linux-2.6/xfs_aops.c 2009-11-06 09:22:35.000000000 +0800 > > +++ linux/fs/xfs/linux-2.6/xfs_aops.c 2009-11-06 09:52:21.000000000 +0800 > > @@ -908,12 +908,8 @@ xfs_convert_page( > > > > bdi = inode->i_mapping->backing_dev_info; > > wbc->nr_to_write--; > > - if (bdi_write_congested(bdi)) { > > - wbc->encountered_congestion = 1; > > bdi is unused now, so can be removed as well. Otherwise looks fine. Thanks, here is the updated patch. --- writeback: remove unused nonblocking and congestion checks (xfs) 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: Dave Chinner <david@xxxxxxxxxxxxx> CC: Christoph Hellwig <hch@xxxxxxxxxxxxx> Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> --- fs/xfs/linux-2.6/xfs_aops.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) --- linux.orig/fs/xfs/linux-2.6/xfs_aops.c 2009-11-19 16:00:51.000000000 +0800 +++ linux/fs/xfs/linux-2.6/xfs_aops.c 2009-11-19 16:04:33.000000000 +0800 @@ -904,16 +904,9 @@ xfs_convert_page( if (startio) { if (count) { - struct backing_dev_info *bdi; - - bdi = inode->i_mapping->backing_dev_info; wbc->nr_to_write--; - if (bdi_write_congested(bdi)) { - wbc->encountered_congestion = 1; - done = 1; - } else if (wbc->nr_to_write <= 0) { + if (wbc->nr_to_write <= 0) done = 1; - } } xfs_start_page_writeback(page, !page_dirty, count); } -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html