Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

xfs: Fix wrong return value of xfs_file_aio_write

Browse source 
The fsync prototype change commit 02c24a8218 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>
This commit is contained in:
Markus Trippelsdorf 2011-07-24 14:03:30 +02:00 committed by Al Viro
parent e13889bab3
commit 340a0a01b9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/xfs/linux-2.6/xfs_file.c
View file

@ -881,11 +881,14 @@ xfs_file_aio_write(
/* Handle various SYNC-type writes */ /* Handle various SYNC-type writes */
if ((file->f_flags & O_DSYNC) || IS_SYNC(inode)) { if ((file->f_flags & O_DSYNC) || IS_SYNC(inode)) {
loff_t end = pos + ret - 1; loff_t end = pos + ret - 1;
int error;
xfs_rw_iunlock(ip, iolock); 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); (file->f_flags & __O_SYNC) ? 0 : 1);
xfs_rw_ilock(ip, iolock); xfs_rw_ilock(ip, iolock);
if (error)
ret = error;
} }
out_unlock: out_unlock: