diff options
author | Christoph Hellwig <hch@sgi.com> | 2006-01-11 04:49:42 -0500 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-01-11 04:49:42 -0500 |
commit | f5e596bbef3b0fa583c66c5a83dc9737c0fe2610 (patch) | |
tree | 5e6e318574c86865eb87b3eb897c199823b85467 /fs/xfs/linux-2.6/xfs_aops.c | |
parent | 6c4fe19f66a839bce68fcb7b99cdcb0f31c7a59e (diff) |
[XFS] fix writeback control handling fix a reversed condition on where to
trylock and deal with block layer congestion properly. Patch from David
Chinner and Christoph Hellwig.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:203830a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 9ea33ea6a225..52707b5ddcb8 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -722,8 +722,17 @@ xfs_convert_page( | |||
722 | SetPageUptodate(page); | 722 | SetPageUptodate(page); |
723 | 723 | ||
724 | if (startio) { | 724 | if (startio) { |
725 | if (count) | 725 | if (count) { |
726 | wbc->nr_to_write--; | 726 | struct backing_dev_info *bdi; |
727 | |||
728 | bdi = inode->i_mapping->backing_dev_info; | ||
729 | if (bdi_write_congested(bdi)) { | ||
730 | wbc->encountered_congestion = 1; | ||
731 | done = 1; | ||
732 | } else if (--wbc->nr_to_write <= 0) { | ||
733 | done = 1; | ||
734 | } | ||
735 | } | ||
727 | xfs_start_page_writeback(page, wbc, !page_dirty, count); | 736 | xfs_start_page_writeback(page, wbc, !page_dirty, count); |
728 | } | 737 | } |
729 | 738 | ||
@@ -812,7 +821,7 @@ xfs_page_state_convert( | |||
812 | int all_bh = unmapped; | 821 | int all_bh = unmapped; |
813 | 822 | ||
814 | /* wait for other IO threads? */ | 823 | /* wait for other IO threads? */ |
815 | if (startio && wbc->sync_mode != WB_SYNC_NONE) | 824 | if (startio && (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)) |
816 | trylock_flag |= BMAPI_TRYLOCK; | 825 | trylock_flag |= BMAPI_TRYLOCK; |
817 | 826 | ||
818 | /* Is this page beyond the end of the file? */ | 827 | /* Is this page beyond the end of the file? */ |