lkml.org 
[lkml]   [2010]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[013/197] xfs: Fix error return for fallocate() on XFS
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------


    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);



    \
     
     \ /
      Last update: 2010-04-22 21:31    [W:0.022 / U:2.904 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site