lkml.org 
[lkml]   [2010]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] XFS: handle hole punching via fallocate properly
    Date
    This patch simply allows XFS to handle the hole punching flag in fallocate
    properly. I've tested this with a little program that does a bunch of random
    hole punching with FL_KEEP_SIZE and without it to make sure it does the right
    thing. Thanks,

    Signed-off-by: Josef Bacik <josef@redhat.com>
    ---
    fs/xfs/linux-2.6/xfs_iops.c | 9 ++++++---
    1 files changed, 6 insertions(+), 3 deletions(-)

    diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
    index 96107ef..63cc929 100644
    --- a/fs/xfs/linux-2.6/xfs_iops.c
    +++ b/fs/xfs/linux-2.6/xfs_iops.c
    @@ -516,6 +516,7 @@ xfs_vn_fallocate(
    loff_t new_size = 0;
    xfs_flock64_t bf;
    xfs_inode_t *ip = XFS_I(inode);
    + int cmd = XFS_IOC_RESVSP;

    /* preallocation on directories not yet supported */
    error = -ENODEV;
    @@ -528,8 +529,11 @@ xfs_vn_fallocate(

    xfs_ilock(ip, XFS_IOLOCK_EXCL);

    + if (mode & FALLOC_FL_PUNCH_HOLE)
    + cmd = XFS_IOC_UNRESVSP;
    +
    /* check the new inode size is valid before allocating */
    - if (!(mode & FALLOC_FL_KEEP_SIZE) &&
    + if (!(mode & (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) &&
    offset + len > i_size_read(inode)) {
    new_size = offset + len;
    error = inode_newsize_ok(inode, new_size);
    @@ -537,8 +541,7 @@ xfs_vn_fallocate(
    goto out_unlock;
    }

    - error = -xfs_change_file_space(ip, XFS_IOC_RESVSP, &bf,
    - 0, XFS_ATTR_NOLOCK);
    + error = -xfs_change_file_space(ip, cmd, &bf, 0, XFS_ATTR_NOLOCK);
    if (error)
    goto out_unlock;

    --
    1.6.6.1


    \
     
     \ /
      Last update: 2010-11-15 18:19    [W:7.300 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site