diff options
| author |   Markus Trippelsdorf <markus@trippelsdorf.de> | 2011-07-24 14:03:30 +0200 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:23:21 -0400 |
| commit | 340a0a01b9675a16201cc4fc4a210eb5b3bc11ce (patch) | |
| tree | 472f690c330e08391b286430a79864c9c83fc3cf /fs | |
| parent | fix devtmpfs race (diff) | |
| download | linux-dev-340a0a01b9675a16201cc4fc4a210eb5b3bc11ce.tar.xz linux-dev-340a0a01b9675a16201cc4fc4a210eb5b3bc11ce.zip | |
xfs: Fix wrong return value of xfs_file_aio_write
The fsync prototype change commit 02c24a82187d accidentally overwrote
the ssize_t return value of xfs_file_aio_write with 0 for SYNC type
writes. Fix this by checking if an error occured when calling
xfs_file_fsync and only change the return value in this case.
In addition xfs_file_fsync actually returns a normal negative error, so
fix this, too.
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index cca00f49e092..825390e1c138 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c @@ -881,11 +881,14 @@ xfs_file_aio_write( /* Handle various SYNC-type writes */ if ((file->f_flags & O_DSYNC) || IS_SYNC(inode)) { loff_t end = pos + ret - 1; + int error; xfs_rw_iunlock(ip, iolock); - ret = -xfs_file_fsync(file, pos, end, + error = xfs_file_fsync(file, pos, end, (file->f_flags & __O_SYNC) ? 0 : 1); xfs_rw_ilock(ip, iolock); + if (error) + ret = error; } out_unlock: |