NFS: Add support for fallocate(FALLOC_FL_ZERO_RANGE)
Subsystems (2)
Anna Schumaker
maintainerPATCH 1/1 NFS: Add support for fallocate(FALLOC_FL_ZERO_RANGE)
From: Anna Schumaker <[email protected]>
This implements a suggestion from Trond that we can mimic FALLOC_FL_ZERO_RANGE by sending a compound that first does a DEALLOCATE to punch a hole in a file, and then an ALLOCATE to fill the hole with zeroes. There might technically be a race here, but once the DEALLOCATE finishes any reads from the region would return zeroes anyway, so I don't expect it to cause problems.
Signed-off-by Anna Schumaker <[email protected]>
--- fs/nfs/nfs42.h | 1 + fs/nfs/nfs42proc.c | 29 ++++++++++++++++-- fs/nfs/nfs42xdr.c | 64 +++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4file.c | 10 +++++- fs/nfs/nfs4proc.c | 1 + fs/nfs/nfs4xdr.c | 1 + include/linux/nfs4.h | 1 + include/linux/nfs_fs_sb.h | 1 + 8 files changed, 105 insertions(+), 3 deletions(-)
fs/nfs/nfs42.h +1 -0
@@ -21,6 +21,7 @@ int nfs42_proc_allocate(struct file *, loff_t, loff_t);ssize_t nfs42_proc_copy (struct file *,loff_t ,struct file *,loff_t ,size_t ,struct nl4_server *,nfs4_stateid *,bool );int nfs42_proc_deallocate (struct file *,loff_t ,loff_t ); +int nfs42_proc_zero_range (struct file *,loff_t ,loff_t );loff_t nfs42_proc_llseek (struct file *,loff_t ,int );int nfs42_proc_layoutstats_generic (struct nfs_server *,struct nfs42_layoutstat_data *);
fs/nfs/nfs42proc.c +27 -2
@@ -146,7 +146,8 @@ int nfs42_proc_allocate(struct file *filep, loff_t offset, loff_t len) err =nfs42_proc_fallocate (&msg, filep, offset, len);if (err == -EOPNOTSUPP ) -NFS_SERVER (inode)->caps &= ~NFS_CAP_ALLOCATE ; +NFS_SERVER (inode)->caps &= ~(NFS_CAP_ALLOCATE | +NFS_CAP_ZERO_RANGE );inode_unlock (inode);return err;
@@ -169,7 +170,31 @@ int nfs42_proc_deallocate(struct file *filep, loff_t offset, loff_t len)if (err ==0 )truncate_pagecache_range (inode, offset, (offset + len) -1 );if (err == -EOPNOTSUPP ) -NFS_SERVER (inode)->caps &= ~NFS_CAP_DEALLOCATE ; +NFS_SERVER (inode)->caps &= ~(NFS_CAP_DEALLOCATE | +NFS_CAP_ZERO_RANGE ); + +inode_unlock (inode); +return err; +} + +int nfs42_proc_zero_range (struct file *filep,loff_t offset,loff_t len) +{ +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_ZERO_RANGE ], + }; +struct inode *inode =file_inode (filep); +int err; + +if (!nfs_server_capable (inode,NFS_CAP_ZERO_RANGE )) +return -EOPNOTSUPP ; + +inode_lock (inode); + + err =nfs42_proc_fallocate (&msg, filep, offset, len); +if (err ==0 ) +truncate_pagecache_range (inode, offset, (offset + len) -1 ); +if (err == -EOPNOTSUPP ) +NFS_SERVER (inode)->caps &= ~NFS_CAP_ZERO_RANGE ;inode_unlock (inode);return err;
fs/nfs/nfs42xdr.c +64 -0
82 lines not on this page · raw message
fs/nfs/nfs4file.c +9 -1
@@ -225,8 +225,14 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_tif (!S_ISREG (inode->i_mode))return -EOPNOTSUPP ; -if ((mode !=0 ) && (mode != (FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ))) +switch (mode) { +case 0 : +case FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE : +case FALLOC_FL_ZERO_RANGE : +break ; +default :return -EOPNOTSUPP ; + } ret =inode_newsize_ok (inode, offset + len);if (ret <0 )
@@ -234,6 +240,8 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_tif (mode &FALLOC_FL_PUNCH_HOLE )return nfs42_proc_deallocate (filep, offset, len); +else if (mode &FALLOC_FL_ZERO_RANGE ) +return nfs42_proc_zero_range (filep, offset ,len);return nfs42_proc_allocate (filep, offset, len); }
fs/nfs/nfs4proc.c +1 -0
@@ -10816,6 +10816,7 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { | NFS_CAP_OFFLOAD_CANCEL |NFS_CAP_COPY_NOTIFY |NFS_CAP_DEALLOCATE + |NFS_CAP_ZERO_RANGE |NFS_CAP_SEEK |NFS_CAP_LAYOUTSTATS |NFS_CAP_CLONE
fs/nfs/nfs4xdr.c +1 -0
@@ -7711,6 +7711,7 @@ const struct rpc_procinfo nfs4_procedures[] = {PROC42 (LISTXATTRS , enc_listxattrs, dec_listxattrs),PROC42 (REMOVEXATTR , enc_removexattr, dec_removexattr),PROC42 (READ_PLUS , enc_read_plus, dec_read_plus), + PROC42(ZERO_RANGE, enc_zero_range, dec_zero_range), };static unsigned int nfs_version4_counts[ARRAY_SIZE (nfs4_procedures)];
include/linux/nfs4.h +1 -0
@@ -679,6 +679,7 @@ enum {NFSPROC4_CLNT_SEEK ,NFSPROC4_CLNT_ALLOCATE ,NFSPROC4_CLNT_DEALLOCATE , +NFSPROC4_CLNT_ZERO_RANGE ,NFSPROC4_CLNT_LAYOUTSTATS ,NFSPROC4_CLNT_CLONE , NFSPROC4_CLNT_COPY,
include/linux/nfs_fs_sb.h +1 -0
@@ -298,6 +298,7 @@ struct nfs_server {#define NFS_CAP_CASE_PRESERVING (1U << 7)#define NFS_CAP_REBOOT_LAYOUTRETURN (1U << 8)#define NFS_CAP_OFFLOAD_STATUS (1U << 9) +#define NFS_CAP_ZERO_RANGE (1U << 10)#define NFS_CAP_OPEN_XOR (1U << 12)#define NFS_CAP_DELEGTIME (1U << 13)#define NFS_CAP_POSIX_LOCK (1U << 14)
Signature · 1 line
2.49.0