Messages in this thread Patch in this message | | | Date | Wed, 18 Nov 2009 16:26:52 +0800 | From | Wu Fengguang <> | Subject | [PATCH 04/12] writeback: remove unused nonblocking and congestion checks (afs) |
| |
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: David Howells <dhowells@redhat.com> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> --- fs/afs/write.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
--- linux.orig/fs/afs/write.c 2009-11-06 09:36:28.000000000 +0800 +++ linux/fs/afs/write.c 2009-11-06 09:52:13.000000000 +0800 @@ -455,8 +455,6 @@ int afs_writepage(struct page *page, str } wbc->nr_to_write -= ret; - if (wbc->nonblocking && bdi_write_congested(bdi)) - wbc->encountered_congestion = 1; _leave(" = 0"); return 0; @@ -529,11 +527,6 @@ static int afs_writepages_region(struct wbc->nr_to_write -= ret; - if (wbc->nonblocking && bdi_write_congested(bdi)) { - wbc->encountered_congestion = 1; - break; - } - cond_resched(); } while (index < end && wbc->nr_to_write > 0); @@ -554,18 +547,11 @@ int afs_writepages(struct address_space _enter(""); - if (wbc->nonblocking && bdi_write_congested(bdi)) { - wbc->encountered_congestion = 1; - _leave(" = 0 [congest]"); - return 0; - } - if (wbc->range_cyclic) { start = mapping->writeback_index; end = -1; ret = afs_writepages_region(mapping, wbc, start, end, &next); - if (start > 0 && wbc->nr_to_write > 0 && ret == 0 && - !(wbc->nonblocking && wbc->encountered_congestion)) + if (start > 0 && wbc->nr_to_write > 0 && ret == 0) ret = afs_writepages_region(mapping, wbc, 0, start, &next); mapping->writeback_index = next;
| |