Hole Punching V3
Subsystems (6)
This is version 3 of the hole punching series I've been posting. Not much has changed, the history is below
V2->V3
-FALLOC_FL_PUNCH_HOLE must also have FALLOC_FL_KEEP_SIZE in order to work -formatting fixes
V1->V2
-Hole punching doesn't change file size
-Fixed the mode checks in ext4/btrfs/gfs2 so they do what they are supposed to
I've updated my local copies of the xfsprogs patches I have to test this to use KEEP_SIZE and PUNCH_HOLE together, I'll post them after it looks like these patches are good to go, including the manpage update. The xfstest I wrote ran fine both on xfs and btrfs (failing on btrfs obviously). Thanks,
Josef
PATCH 1/6 fs: add hole punching to fallocate
Hole punching has already been implemented by XFS and OCFS2, and has the potential to be implemented on both BTRFS and EXT4 so we need a generic way to get to this feature. The simplest way in my mind is to add FALLOC_FL_PUNCH_HOLE to fallocate() since it already looks like the normal fallocate() operation. I've tested this patch with XFS and BTRFS to make sure XFS did what it's supposed to do and that BTRFS failed like it was supposed to. Thank you,
--- fs/open.c | 7 ++++++- include/linux/falloc.h | 1 + 2 files changed, 7 insertions(+), 1 deletions(-)
fs/open.c +6 -1
@@ -223,7 +223,12 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)return -EINVAL ;/* Return error if mode is not supported */ -if (mode && !(mode &FALLOC_FL_KEEP_SIZE )) +if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE )) +return -EOPNOTSUPP ; + +/* Punch hole must have keep size set */ +if ((mode &FALLOC_FL_PUNCH_HOLE ) && + !(mode &FALLOC_FL_KEEP_SIZE ))return -EOPNOTSUPP ;if (!(file->f_mode &FMODE_WRITE ))
include/linux/falloc.h +1 -0
@@ -2,6 +2,7 @@#define _FALLOC_H_#define FALLOC_FL_KEEP_SIZE 0x01/* default is extend size */ +#define FALLOC_FL_PUNCH_HOLE 0x02/* de-allocates range */ #ifdef __KERNEL__
Signature · 1 line
1.6.6.1
Jan Kara
reviewerRe: [PATCH 1/6] fs: add hole punching to fallocate
Quoted 6 lines · Josef Bacik
Hole punching has already been implemented by XFS and OCFS2, and has the potential to be implemented on both BTRFS and EXT4 so we need a generic way to get to this feature. The simplest way in my mind is to add
FALLOC_FL_PUNCH_HOLEtofallocate()since it already looks like the normalfallocate()operation. I've tested this patch with XFS and BTRFS to make sure XFS did what it's supposed to do and that BTRFS failed like it was supposed to. Thank you,
Looks nice now. Acked-by: Jan Kara <[email protected]>
Honza
Quoted 40 lines
Signed-off-by Josef Bacik <[email protected]>--- fs/open.c | 7 ++++++- include/linux/falloc.h | 1 + 2 files changed, 7 insertions(+), 1 deletions(-)fs/open.c +6
-1@@ -223,7 +223,12 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)return -EINVAL ;/* Return error if mode is not supported */ -if (mode && !(mode &FALLOC_FL_KEEP_SIZE )) +if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE )) +return -EOPNOTSUPP ; + +/* Punch hole must have keep size set */ +if ((mode &FALLOC_FL_PUNCH_HOLE ) && + !(mode &FALLOC_FL_KEEP_SIZE ))return -EOPNOTSUPP ;if (!(file->f_mode &FMODE_WRITE ))include/linux/falloc.h +1
-0@@ -2,6 +2,7 @@#define _FALLOC_H_#define FALLOC_FL_KEEP_SIZE 0x01/* default is extend size */ +#define FALLOC_FL_PUNCH_HOLE 0x02/* de-allocates range */ #ifdef __KERNEL__Signature · 1 line
1.6.6.1
Signature · 7 lines
Jan Kara <[email protected]> SUSE Labs, CR _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH 2/6 XFS: handle hole punching via fallocate properly
In reply to Josef BacikThis 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,
--- fs/xfs/linux-2.6/xfs_iops.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
fs/xfs/linux-2.6/xfs_iops.c +5 -2
@@ -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,6 +529,9 @@ 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 ) && offset + len >i_size_read (inode)) {
@@ -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;
Signature · 1 line
1.6.6.1
PATCH 3/6 Ocfs2: handle hole punching via fallocate properly
In reply to Josef BacikThis patch just makes ocfs2 use its UNRESERVP ioctl when we get the hole punch flag in fallocate. I didn't test it, but it seems simple enough. Thanks,
--- fs/ocfs2/file.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
fs/ocfs2/file.c +6 -2
@@ -1992,6 +1992,7 @@ static long ocfs2_fallocate(struct inode *inode, int mode, loff_t offset,struct ocfs2_super *osb =OCFS2_SB (inode->i_sb);struct ocfs2_space_resv sr;int change_size =1 ; +int cmd =OCFS2_IOC_RESVSP64 ;if (!ocfs2_writes_unwritten_extents (osb))return -EOPNOTSUPP ;
@@ -2002,12 +2003,15 @@ static long ocfs2_fallocate(struct inode *inode, int mode, loff_t offset,if (mode &FALLOC_FL_KEEP_SIZE ) change_size =0 ; +if (mode &FALLOC_FL_PUNCH_HOLE ) + cmd =OCFS2_IOC_UNRESVSP64 ; + sr.l_whence =0 ; sr.l_start = (s64 )offset; sr.l_len = (s64 )len; -return __ocfs2_change_file_space (NULL , inode, offset, -OCFS2_IOC_RESVSP64 , &sr, change_size); +return __ocfs2_change_file_space (NULL , inode, offset, cmd, &sr, + change_size); } int ocfs2_check_range_for_refcount(struct inode *inode, loff_t pos,
Signature · 1 line
1.6.6.1
PATCH 4/6 Ext4: fail if we try to use hole punch
In reply to Josef BacikExt4 doesn't have the ability to punch holes yet, so make sure we return EOPNOTSUPP if we try to use hole punching through fallocate. This support can be added later. Thanks,
--- fs/ext4/extents.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
fs/ext4/extents.c +4 -0
@@ -3622,6 +3622,10 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len)struct ext4_map_blocks map;unsigned int credits, blkbits = inode->i_blkbits; +/* We only support the FALLOC_FL_KEEP_SIZE mode */ +if (mode && (mode !=FALLOC_FL_KEEP_SIZE )) +return -EOPNOTSUPP ; +/* * currently supporting (pre)allocate mode for extent-based * files _only_
Signature · 1 line
1.6.6.1
PATCH 5/6 Btrfs: fail if we try to use hole punch
In reply to Josef BacikBtrfs doesn't have the ability to punch holes yet, so make sure we return EOPNOTSUPP if we try to use hole punching through fallocate. This support can be added later. Thanks,
--- fs/btrfs/inode.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
fs/btrfs/inode.c +4 -0
@@ -6936,6 +6936,10 @@ static long btrfs_fallocate(struct inode *inode, int mode, alloc_start = offset & ~mask; alloc_end = (offset + len + mask) & ~mask; +/* We only support the FALLOC_FL_KEEP_SIZE mode */ +if (mode && (mode !=FALLOC_FL_KEEP_SIZE )) +return -EOPNOTSUPP ; +/* * wait for ordered IO before we have any locks. We'll loop again * below with the locks held.
Signature · 1 line
1.6.6.1
PATCH 6/6 Gfs2: fail if we try to use hole punch
In reply to Josef BacikGfs2 doesn't have the ability to punch holes yet, so make sure we return EOPNOTSUPP if we try to use hole punching through fallocate. This support can be added later. Thanks,
--- fs/gfs2/ops_inode.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
fs/gfs2/ops_inode.c +4 -0
@@ -1439,6 +1439,10 @@ static long gfs2_fallocate(struct inode *inode, int mode, loff_t offset,loff_t next = (offset + len -1 ) >> sdp->sd_sb.sb_bsize_shift; next = (next +1 ) << sdp->sd_sb.sb_bsize_shift; +/* We only support the FALLOC_FL_KEEP_SIZE mode */ +if (mode && (mode !=FALLOC_FL_KEEP_SIZE )) +return -EOPNOTSUPP ; + offset = (offset >> sdp->sd_sb.sb_bsize_shift) << sdp->sd_sb.sb_bsize_shift;
Signature · 1 line
1.6.6.1
Quoted 11 lines · Josef Bacik
This is version 3 of the hole punching series I've been posting. Not much has changed, the history is below
V2->V3(quoted diff) +0
-2-FALLOC_FL_PUNCH_HOLE must also have FALLOC_FL_KEEP_SIZE in order to work -formatting fixes
V1->V2(quoted diff) +0
-2-Hole punching doesn't change file size -Fixed the mode checks in ext4/btrfs/gfs2 so they do what they are supposed to
Quoted 5 lines
I've updated my local copies of the xfsprogs patches I have to test this to use
KEEP_SIZEandPUNCH_HOLEtogether, I'll post them after it looks like these patches are good to go, including the manpage update. The xfstest I wrote ran fine both on xfs and btrfs (failing on btrfs obviously). Thanks,
I'd like to try and get this into the next merge window, it seems everybody is happy with it so far, any other comments? Provided everybody is ok with it, how would you like me to send it to you Linus? Would you prefer a pull request or will you just pull the patches off the mailinglist? Thanks,
Josef
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs