AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[XFS] Fix a writepage regression where we accidentally stopped honouring

Browse Source 
nonblock mode with the new IO path code (since 2.6.16).

SGI-PV: 951662
SGI-Modid: xfs-linux-melb:xfs-kern:25676a

Signed-off-by: Nathan Scott <nathans@sgi.com>
This commit is contained in:
Nathan Scott 2006-04-11 15:10:55 +10:00
parent e50bd16fe4
commit 8272145c05
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/xfs/linux-2.6/xfs_aops.c
View File

@ -870,12 +870,14 @@ xfs_page_state_convert(
pgoff_t end_index, last_index, tlast; pgoff_t end_index, last_index, tlast;
ssize_t size, len; ssize_t size, len;
int flags, err, iomap_valid = 0, uptodate = 1; int flags, err, iomap_valid = 0, uptodate = 1;
int page_dirty, count = 0, trylock_flag = 0; int page_dirty, count = 0;
int trylock = 0;
int all_bh = unmapped; int all_bh = unmapped;
/* wait for other IO threads? */ if (startio) {
if (startio && (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)) if (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)
trylock_flag |= BMAPI_TRYLOCK; trylock |= BMAPI_TRYLOCK;
}
/* Is this page beyond the end of the file? */ /* Is this page beyond the end of the file? */
offset = i_size_read(inode); offset = i_size_read(inode);
@ -956,15 +958,13 @@ xfs_page_state_convert(
if (buffer_unwritten(bh)) { if (buffer_unwritten(bh)) {
type = IOMAP_UNWRITTEN; type = IOMAP_UNWRITTEN;
flags = BMAPI_WRITE|BMAPI_IGNSTATE; flags = BMAPI_WRITE | BMAPI_IGNSTATE;
} else if (buffer_delay(bh)) { } else if (buffer_delay(bh)) {
type = IOMAP_DELAY; type = IOMAP_DELAY;
flags = BMAPI_ALLOCATE; flags = BMAPI_ALLOCATE | trylock;
if (!startio)
flags |= trylock_flag;
} else { } else {
type = IOMAP_NEW; type = IOMAP_NEW;
flags = BMAPI_WRITE|BMAPI_MMAP; flags = BMAPI_WRITE | BMAPI_MMAP;
} }
if (!iomap_valid) { if (!iomap_valid) {