summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2011-07-24 14:03:30 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-25 14:23:21 -0400
commit340a0a01b9675a16201cc4fc4a210eb5b3bc11ce (patch)
tree472f690c330e08391b286430a79864c9c83fc3cf /fs/xfs
parente13889bab3c6b5c839075086d28fe05f71984dda (diff)
downloadlinux-3.10-340a0a01b9675a16201cc4fc4a210eb5b3bc11ce.tar.gz
linux-3.10-340a0a01b9675a16201cc4fc4a210eb5b3bc11ce.tar.bz2
linux-3.10-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 'fs/xfs')
-rw-r--r--fs/xfs/linux-2.6/xfs_file.c5
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 cca00f49e09..825390e1c13 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: