Skip to content

Commit

Permalink
xfs: Fix wrong return value of xfs_file_aio_write
Browse files Browse the repository at this point in the history
The fsync prototype change commit 02c24a8 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>
  • Loading branch information
Markus Trippelsdorf authored and Al Viro committed Jul 25, 2011
1 parent e13889b commit 340a0a0
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion fs/xfs/linux-2.6/xfs_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 340a0a0

Please sign in to comment.