mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

[XFS] fix writeback control handling fix a reversed condition on where to

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2006-01-11 20:49:42 +11:00 committed by Nathan Scott
parent 6c4fe19f66
commit f5e596bbef
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/xfs/linux-2.6/xfs_aops.c
View file

@ -722,8 +722,17 @@ xfs_convert_page(
SetPageUptodate(page);
if (startio) {
if (count)
wbc->nr_to_write--;
if (count) {
struct backing_dev_info *bdi;
bdi = inode->i_mapping->backing_dev_info;
if (bdi_write_congested(bdi)) {
wbc->encountered_congestion = 1;
done = 1;
} else if (--wbc->nr_to_write <= 0) {
done = 1;
}
}
xfs_start_page_writeback(page, wbc, !page_dirty, count);
}
@ -812,7 +821,7 @@ xfs_page_state_convert(
int all_bh = unmapped;
/* wait for other IO threads? */
if (startio && wbc->sync_mode != WB_SYNC_NONE)
if (startio && (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking))
trylock_flag |= BMAPI_TRYLOCK;
/* Is this page beyond the end of the file? */