| From david@fromorbit.com Fri Apr 2 11:06:34 2010 |
| From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> |
| Date: Fri, 12 Mar 2010 09:42:03 +1100 |
| Subject: xfs: Fix error return for fallocate() on XFS |
| To: stable@kernel.org |
| Cc: xfs@oss.sgi.com |
| Message-ID: <1268347337-7160-6-git-send-email-david@fromorbit.com> |
| |
| |
| From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> |
| |
| commit 44a743f68705c681439f264deb05f8f38e9048d3 upstream |
| |
| Noticed that through glibc fallocate would return 28 rather than -1 |
| and errno = 28 for ENOSPC. The xfs routines uses XFS_ERROR format |
| positive return error codes while the syscalls use negative return |
| codes. Fixup the two cases in xfs_vn_fallocate syscall to convert to |
| negative. |
| |
| Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> |
| Reviewed-by: Eric Sandeen <sandeen@sandeen.net> |
| Signed-off-by: Alex Elder <aelder@sgi.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/xfs/linux-2.6/xfs_iops.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/fs/xfs/linux-2.6/xfs_iops.c |
| +++ b/fs/xfs/linux-2.6/xfs_iops.c |
| @@ -573,8 +573,8 @@ xfs_vn_fallocate( |
| bf.l_len = len; |
| |
| xfs_ilock(ip, XFS_IOLOCK_EXCL); |
| - error = xfs_change_file_space(ip, XFS_IOC_RESVSP, &bf, |
| - 0, XFS_ATTR_NOLOCK); |
| + error = -xfs_change_file_space(ip, XFS_IOC_RESVSP, &bf, |
| + 0, XFS_ATTR_NOLOCK); |
| if (!error && !(mode & FALLOC_FL_KEEP_SIZE) && |
| offset + len > i_size_read(inode)) |
| new_size = offset + len; |
| @@ -585,7 +585,7 @@ xfs_vn_fallocate( |
| |
| iattr.ia_valid = ATTR_SIZE; |
| iattr.ia_size = new_size; |
| - error = xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK); |
| + error = -xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK); |
| } |
| |
| xfs_iunlock(ip, XFS_IOLOCK_EXCL); |
