diff options
author | Wu Fengguang <fengguang.wu@gmail.com> | 2009-12-03 07:54:25 -0500 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:54:25 -0500 |
commit | 0d99519efef15fd0cf84a849492c7b1deee1e4b7 (patch) | |
tree | d0f9d922ef73f6b9c4529826878f3cc5567848fd /drivers | |
parent | b17621fed6aa039387e35f9b4d34d98f213e5673 (diff) |
writeback: remove unused nonblocking and congestion checks
- no one is calling wb_writeback and write_cache_pages with
wbc.nonblocking=1 any more
- lumpy pageout will want to do nonblocking writeback without the
congestion wait
So remove the congestion checks as suggested by Chris.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Alex Elder <aelder@sgi.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/pohmelfs/inode.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index c94de313922..f69b7783027 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c | |||
@@ -143,7 +143,6 @@ static int pohmelfs_writepages(struct address_space *mapping, struct writeback_c | |||
143 | struct inode *inode = mapping->host; | 143 | struct inode *inode = mapping->host; |
144 | struct pohmelfs_inode *pi = POHMELFS_I(inode); | 144 | struct pohmelfs_inode *pi = POHMELFS_I(inode); |
145 | struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb); | 145 | struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb); |
146 | struct backing_dev_info *bdi = mapping->backing_dev_info; | ||
147 | int err = 0; | 146 | int err = 0; |
148 | int done = 0; | 147 | int done = 0; |
149 | int nr_pages; | 148 | int nr_pages; |
@@ -152,11 +151,6 @@ static int pohmelfs_writepages(struct address_space *mapping, struct writeback_c | |||
152 | int scanned = 0; | 151 | int scanned = 0; |
153 | int range_whole = 0; | 152 | int range_whole = 0; |
154 | 153 | ||
155 | if (wbc->nonblocking && bdi_write_congested(bdi)) { | ||
156 | wbc->encountered_congestion = 1; | ||
157 | return 0; | ||
158 | } | ||
159 | |||
160 | if (wbc->range_cyclic) { | 154 | if (wbc->range_cyclic) { |
161 | index = mapping->writeback_index; /* Start from prev offset */ | 155 | index = mapping->writeback_index; /* Start from prev offset */ |
162 | end = -1; | 156 | end = -1; |
@@ -248,10 +242,6 @@ retry: | |||
248 | 242 | ||
249 | if (wbc->nr_to_write <= 0) | 243 | if (wbc->nr_to_write <= 0) |
250 | done = 1; | 244 | done = 1; |
251 | if (wbc->nonblocking && bdi_write_congested(bdi)) { | ||
252 | wbc->encountered_congestion = 1; | ||
253 | done = 1; | ||
254 | } | ||
255 | 245 | ||
256 | continue; | 246 | continue; |
257 | out_continue: | 247 | out_continue: |