[PATCH 1/7] xfs: ensure sync write errors are returned

[Dave Chinner]

From: Dave Chinner <dchinner at redhat.com>

xfs_file_aio_write() only returns the error from synchronous
flushing of the data and inode if error == 0. At the point where
error is being checked, it is guaranteed to be > 0. Therefore any
errors returned by the data or fsync flush will never be returned.
Fix the checks so we overwrite the current error once and only if an
error really occurred.

Signed-off-by: Dave Chinner <dchinner at redhat.com>
---
 fs/xfs/linux-2.6/xfs_file.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index ba8ad42..e1eaec2 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -769,7 +769,7 @@ write_retry:
 			mutex_unlock(&inode->i_mutex);
 
 		error2 = filemap_write_and_wait_range(mapping, pos, end);
-		if (!error)
+		if (error2)
 			error = error2;
 		if (need_i_mutex)
 			mutex_lock(&inode->i_mutex);
@@ -777,7 +777,7 @@ write_retry:
 
 		error2 = -xfs_file_fsync(file,
 					 (file->f_flags & __O_SYNC) ? 0 : 1);
-		if (!error)
+		if (error2 && error >= 0)
 			error = error2;
 	}
 
-- 
1.7.2.3