aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_super.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2008-11-27 22:23:33 -0500
committerNiv Sardi <xaiki@sgi.com>2008-11-30 19:11:10 -0500
commit2e6560929d8ab4b650fecc3a87013852b34f0922 (patch)
tree59da3284d66e3a5bdf86780a009bf2ce941fbfd4 /fs/xfs/linux-2.6/xfs_super.c
parent65795910c1b798f8a47181b48cf6eb163a15e778 (diff)
[XFS] fix error inversion problems with data flushing
XFS gets the sign of the error wrong in several places when gathering the error from generic linux functions. These functions return negative error values, while the core XFS code returns positive error values. Hence when XFS inverts the error to be returned to the VFS, it can incorrectly invert a negative error and this error will be ignored by the syscall return. Fix all the problems related to calling filemap_* functions. Problem initially identified by Nick Piggin in xfs_fsync(). Signed-off-by: Dave Chinner <david@fromorbit.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Niv Sardi <xaiki@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index cc5e07e3e7a1..ae92290e3c14 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -990,21 +990,26 @@ xfs_fs_write_inode(
990 struct inode *inode, 990 struct inode *inode,
991 int sync) 991 int sync)
992{ 992{
993 struct xfs_inode *ip = XFS_I(inode);
993 int error = 0; 994 int error = 0;
994 int flags = 0; 995 int flags = 0;
995 996
996 xfs_itrace_entry(XFS_I(inode)); 997 xfs_itrace_entry(ip);
997 if (sync) { 998 if (sync) {
998 filemap_fdatawait(inode->i_mapping); 999 error = xfs_wait_on_pages(ip, 0, -1);
1000 if (error)
1001 goto out_error;
999 flags |= FLUSH_SYNC; 1002 flags |= FLUSH_SYNC;
1000 } 1003 }
1001 error = xfs_inode_flush(XFS_I(inode), flags); 1004 error = xfs_inode_flush(ip, flags);
1005
1006out_error:
1002 /* 1007 /*
1003 * if we failed to write out the inode then mark 1008 * if we failed to write out the inode then mark
1004 * it dirty again so we'll try again later. 1009 * it dirty again so we'll try again later.
1005 */ 1010 */
1006 if (error) 1011 if (error)
1007 xfs_mark_inode_dirty_sync(XFS_I(inode)); 1012 xfs_mark_inode_dirty_sync(ip);
1008 1013
1009 return -error; 1014 return -error;
1010} 1015}