From 6cb71592263781f2bcc31545de8f6d8524ee113c Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Wed, 18 Nov 2009 18:09:41 +0800 Subject: [PATCH] --- yaml --- r: 169207 b: refs/heads/master c: c29cd9004e72acb5a6cb8caf08508f1c5edee686 h: refs/heads/master i: 169205: a5317e6ea8b438c11dc12c7e540e08cbbf2a1ca5 169203: 2021ef848fc17e22a8d971f4813c8e5bf122b0a6 169199: fb27c6c5154cea85fd086b00772dcaf35cd3dbcd v: v3 --- [refs] | 2 +- trunk/fs/gfs2/aops.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index a84f1a220725..12334ba815df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ae3c6de6981a1e8765b5d029f94555fc0f0fea0 +refs/heads/master: c29cd9004e72acb5a6cb8caf08508f1c5edee686 diff --git a/trunk/fs/gfs2/aops.c b/trunk/fs/gfs2/aops.c index dce062a0b02a..7b8da9415267 100644 --- a/trunk/fs/gfs2/aops.c +++ b/trunk/fs/gfs2/aops.c @@ -269,7 +269,6 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping, pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; unsigned offset = i_size & (PAGE_CACHE_SIZE-1); unsigned nrblocks = nr_pages * (PAGE_CACHE_SIZE/inode->i_sb->s_blocksize); - struct backing_dev_info *bdi = mapping->backing_dev_info; int i; int ret; @@ -313,11 +312,6 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping, 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; @@ -338,7 +332,6 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping, static int gfs2_write_cache_jdata(struct address_space *mapping, struct writeback_control *wbc) { - struct backing_dev_info *bdi = mapping->backing_dev_info; int ret = 0; int done = 0; struct pagevec pvec; @@ -348,11 +341,6 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, 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 */