Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 340a0a01 authored by Markus Trippelsdorf's avatar Markus Trippelsdorf Committed by Al Viro
Browse files

xfs: Fix wrong return value of xfs_file_aio_write 



The fsync prototype change commit 02c24a82 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: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e13889ba

fs/xfs/linux-2.6/xfs_file.c

+4 −1
Original line number Diff line number Diff line
@@ -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: