NFS: Add ALLOCATE and DEALLOCATE support
Subsystems (2)
v5 cover NFS: Add ALLOCATE and DEALLOCATE support
These patches add client support for the ALLOCATE and DEALLOCATE operations part of NFS v4.2, which are triggered by a vfs_fallocate() call.
Changes in v5:
- Make _nfs42_proc_fallocate() and nfs42_proc_fallocate() static to prevent missing prototype warnings (Thanks, Trond!).
These patches and the corresponding server changes are available in the [fallocate] branch of
git://git.linux-nfs.org/projects/anna/linux-nfs.git
Questions? Comments? Thougts?
Anna
Anna Schumaker (2):
nfs: Add ALLOCATE support
nfs: Add DEALLOCATE support
fs/nfs/inode.c | 1 + fs/nfs/nfs42.h | 2 + fs/nfs/nfs42proc.c | 75 +++++++++++++++++++++++++ fs/nfs/nfs42xdr.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 1 + fs/nfs/nfs4file.c | 31 +++++++++++ fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4xdr.c | 2 + include/linux/nfs4.h | 2 + include/linux/nfs_fs_sb.h | 2 + include/linux/nfs_xdr.h | 14 +++++ 11 files changed, 272 insertions(+), 1 deletion(-)
Signature · 1 line
2.1.3
PATCH v5 1/2 nfs: Add ALLOCATE support
This patch adds support for using the NFS v4.2 operation ALLOCATE to preallocate data in a file.
--- fs/nfs/inode.c | 1 + fs/nfs/nfs42.h | 1 + fs/nfs/nfs42proc.c | 58 ++++++++++++++++++++++++++++++++++++ fs/nfs/nfs42xdr.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 1 + fs/nfs/nfs4file.c | 28 ++++++++++++++++++ fs/nfs/nfs4proc.c | 3 +- fs/nfs/nfs4xdr.c | 1 + include/linux/nfs4.h | 1 + include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 14 +++++++++ 11 files changed, 183 insertions(+), 1 deletion(-)
fs/nfs/inode.c +1 -0
@@ -192,6 +192,7 @@ void nfs_zap_caches(struct inode *inode)nfs_zap_caches_locked (inode);spin_unlock (&inode->i_lock); } +EXPORT_SYMBOL_GPL (nfs_zap_caches);void nfs_zap_mapping (struct inode *inode,struct address_space *mapping) {
fs/nfs/nfs42.h +1 -0
@@ -6,6 +6,7 @@#define __LINUX_FS_NFS_NFS4_2_H/* nfs4.2proc.c */ +int nfs42_proc_allocate (struct file *,loff_t ,loff_t );loff_t nfs42_proc_llseek (struct file *,loff_t ,int );/* nfs4.2xdr.h */
fs/nfs/nfs42proc.c +58 -0
64 lines not on this page · raw message
fs/nfs/nfs42xdr.c +75 -0
111 lines not on this page · raw message
fs/nfs/nfs4_fs.h +1 -0
@@ -226,6 +226,7 @@ int nfs4_replace_transport(struct nfs_server *server, const struct nfs4_fs_locations *locations);/* nfs4proc.c */ +extern int nfs4_handle_exception (struct nfs_server *,int ,struct nfs4_exception *);extern int nfs4_call_sync (struct rpc_clnt *,struct nfs_server *,struct rpc_message *,struct nfs4_sequence_args *,struct nfs4_sequence_res *,int );
fs/nfs/nfs4file.c +28 -0
@@ -3,6 +3,8 @@* * Copyright (C) 1992 Rick Sladkey */ +#include <linux/fs.h> +#include <linux/falloc.h> #include <linux/nfs_fs.h> #include "internal.h" #include "fscache.h"
@@ -134,6 +136,29 @@ static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence) return nfs_file_llseek(filep, offset, whence); } } + +static long nfs42_fallocate (struct file *filep,int mode,loff_t offset,loff_t len) +{ +struct inode *inode =file_inode (filep); +long ret; + +if (!S_ISREG (inode->i_mode)) +return -EOPNOTSUPP ; + +if (mode !=0 ) +return -EOPNOTSUPP ; + + ret =inode_newsize_ok (inode, offset + len); +if (ret <0 ) +return ret; + +mutex_lock (&inode->i_mutex); + ret =nfs42_proc_allocate (filep, offset, len); +mutex_unlock (&inode->i_mutex); + +nfs_zap_caches (inode); +return ret; +}#endif /* CONFIG_NFS_V4_2 */ const struct file_operations nfs4_file_operations = {
@@ -155,6 +180,9 @@ const struct file_operations nfs4_file_operations = { .flock = nfs_flock, .splice_read = nfs_file_splice_read, .splice_write = iter_file_splice_write, +#ifdef CONFIG_NFS_V4_2 + .fallocate = nfs42_fallocate, +#endif /* CONFIG_NFS_V4_2 */ .check_flags = nfs_check_flags, .setlease = simple_nosetlease, };
fs/nfs/nfs4proc.c +2 -1
@@ -344,7 +344,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)/* This is the error handling routine for processes that are allowed * to sleep. */ -static int nfs4_handle_exception (struct nfs_server *server,int errorcode,struct nfs4_exception *exception) +int nfs4_handle_exception (struct nfs_server *server,int errorcode,struct nfs4_exception *exception) {struct nfs_client *clp = server->nfs_client;struct nfs4_state *state = exception->state;
@@ -8426,6 +8426,7 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { | NFS_CAP_POSIX_LOCK |NFS_CAP_STATEID_NFSV41 |NFS_CAP_ATOMIC_OPEN_V1 + |NFS_CAP_ALLOCATE | NFS_CAP_SEEK, .init_client = nfs41_init_client, .shutdown_client = nfs41_shutdown_client,
fs/nfs/nfs4xdr.c +1 -0
@@ -7394,6 +7394,7 @@ struct rpc_procinfo nfs4_procedures[] = {#endif /* CONFIG_NFS_V4_1 */ #ifdef CONFIG_NFS_V4_2 PROC(SEEK, enc_seek, dec_seek), + PROC(ALLOCATE, enc_allocate, dec_allocate),#endif /* CONFIG_NFS_V4_2 */ };
include/linux/nfs4.h +1 -0
@@ -490,6 +490,7 @@ enum {/* nfs42 */ NFSPROC4_CLNT_SEEK , + NFSPROC4_CLNT_ALLOCATE, };/* nfs41 types */
include/linux/nfs_fs_sb.h +1 -0
@@ -231,5 +231,6 @@ struct nfs_server {#define NFS_CAP_ATOMIC_OPEN_V1 (1U << 17)#define NFS_CAP_SECURITY_LABEL (1U << 18)#define NFS_CAP_SEEK (1U << 19) +#define NFS_CAP_ALLOCATE (1U << 20)#endif
include/linux/nfs_xdr.h +14 -0
@@ -1243,6 +1243,20 @@ nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)#endif /* CONFIG_NFS_V4_1 */ #ifdef CONFIG_NFS_V4_2 +struct nfs42_falloc_args { + struct nfs4_sequence_args seq_args; + + struct nfs_fh *falloc_fh; + nfs4_stateid falloc_stateid; + u64 falloc_offset; + u64 falloc_length; +}; + +struct nfs42_falloc_res { + struct nfs4_sequence_res seq_res; + unsigned int status; +}; + struct nfs42_seek_args { struct nfs4_sequence_args seq_args;
Signature · 1 line
2.1.3
PATCH v5 2/2 nfs: Add DEALLOCATE support
In reply to Anna SchumakerThis patch adds support for using the NFS v4.2 operation DEALLOCATE to punch holes in a file.
--- fs/nfs/nfs42.h | 1 + fs/nfs/nfs42proc.c | 17 +++++++++++++ fs/nfs/nfs42xdr.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4file.c | 7 ++++-- 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, 91 insertions(+), 2 deletions(-)
fs/nfs/nfs42.h +1 -0
@@ -7,6 +7,7 @@/* nfs4.2proc.c */ int nfs42_proc_allocate (struct file *,loff_t ,loff_t ); +int nfs42_proc_deallocate (struct file *,loff_t ,loff_t );loff_t nfs42_proc_llseek (struct file *,loff_t ,int );/* nfs4.2xdr.h */
fs/nfs/nfs42proc.c +17 -0
@@ -90,6 +90,23 @@ int nfs42_proc_allocate(struct file *filep, loff_t offset, loff_t len)return err; } +int nfs42_proc_deallocate (struct file *filep,loff_t offset,loff_t len) +{ +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_DEALLOCATE ], + }; +struct inode *inode =file_inode (filep); +int err; + +if (!nfs_server_capable (inode,NFS_CAP_DEALLOCATE )) +return -EOPNOTSUPP ; + + err =nfs42_proc_fallocate (&msg, filep, offset, len); +if (err == -EOPNOTSUPP ) +NFS_SERVER (inode)->caps &= ~NFS_CAP_DEALLOCATE ; +return err; +} +loff_t nfs42_proc_llseek (struct file *filep,loff_t offset,int whence) {struct inode *inode =file_inode (filep);
fs/nfs/nfs42xdr.c +64 -0
100 lines not on this page · raw message
fs/nfs/nfs4file.c +5 -2
@@ -145,7 +145,7 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_tif (!S_ISREG (inode->i_mode))return -EOPNOTSUPP ; -if (mode !=0 ) +if ((mode !=0 ) && (mode != (FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE )))return -EOPNOTSUPP ; ret =inode_newsize_ok (inode, offset + len);
@@ -153,7 +153,10 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_treturn ret;mutex_lock (&inode->i_mutex); - ret =nfs42_proc_allocate (filep, offset, len); +if (mode &FALLOC_FL_PUNCH_HOLE ) + ret =nfs42_proc_deallocate (filep, offset, len); +else + ret =nfs42_proc_allocate (filep, offset, len);mutex_unlock (&inode->i_mutex);nfs_zap_caches (inode);
fs/nfs/nfs4proc.c +1 -0
@@ -8427,6 +8427,7 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { | NFS_CAP_STATEID_NFSV41 |NFS_CAP_ATOMIC_OPEN_V1 |NFS_CAP_ALLOCATE + |NFS_CAP_DEALLOCATE | NFS_CAP_SEEK, .init_client = nfs41_init_client, .shutdown_client = nfs41_shutdown_client,
fs/nfs/nfs4xdr.c +1 -0
@@ -7395,6 +7395,7 @@ struct rpc_procinfo nfs4_procedures[] = {#ifdef CONFIG_NFS_V4_2 PROC (SEEK , enc_seek, dec_seek),PROC (ALLOCATE , enc_allocate, dec_allocate), + PROC(DEALLOCATE, enc_deallocate, dec_deallocate), #endif /* CONFIG_NFS_V4_2 */ };
include/linux/nfs4.h +1 -0
@@ -491,6 +491,7 @@ enum {/* nfs42 */ NFSPROC4_CLNT_SEEK ,NFSPROC4_CLNT_ALLOCATE , + NFSPROC4_CLNT_DEALLOCATE, };/* nfs41 types */
include/linux/nfs_fs_sb.h +1 -0
@@ -232,5 +232,6 @@ struct nfs_server {#define NFS_CAP_SECURITY_LABEL (1U << 18)#define NFS_CAP_SEEK (1U << 19)#define NFS_CAP_ALLOCATE (1U << 20) +#define NFS_CAP_DEALLOCATE (1U << 21)#endif
Signature · 1 line
2.1.3