NFS v4.2 support to both the server and client (take 2)
Subsystems (2)
cover NFS v4.2 support to both the server and client (take 2)
These patche added v4.2 support to both the server and client. Basically the v4.1 code is reused, but the minor version is needed to enable features like label NFS.
Note, these patch apply on top of the lNFS: 3.8-rc3 release patches. Although the only conflict if applied without those patches would be in the Kconfig files
Steve Dickson (2):
NFSv4.2: Added NFS v4.2 support to the NFS client NFSDv4.2: Added NFS v4.2 support to the NFS server
fs/nfs/Kconfig | 12 +++++++++++- fs/nfs/callback.c | 3 +++ fs/nfs/nfs4client.c | 5 +++++ fs/nfs/nfs4proc.c | 3 +++ fs/nfs/super.c | 7 ++++++- fs/nfsd/nfs4xdr.c | 1 + fs/nfsd/nfsd.h | 2 +- include/linux/nfs4.h | 4 ++++ 8 files changed, 34 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/2 NFSv4.2: Added NFS v4.2 support to the NFS client
This enable NFSv4.2 support. To enable this code the CONFIG_NFS_V4_2 Kconfig define needs to be set and the -o v4.2 mount option need to be used.
--- fs/nfs/Kconfig | 12 +++++++++++- fs/nfs/callback.c | 3 +++ fs/nfs/nfs4client.c | 5 +++++ fs/nfs/nfs4proc.c | 3 +++ fs/nfs/super.c | 7 ++++++- include/linux/nfs4.h | 4 ++++ 6 files changed, 32 insertions(+), 2 deletions(-)
fs/nfs/Kconfig +11 -1
@@ -104,6 +104,16 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + select NFS_V4_SECURITY_LABEL + help + This option enables support for minor version 1 of the NFSv4 protocol + in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1
@@ -133,7 +143,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN config NFS_V4_SECURITY_LABEL bool "Provide Security Label support for NFSv4 client" - depends on NFS_V4 && SECURITY + depends on NFS_V4_2 && SECURITY help Say Y here if you want enable fine-grained security label attribute
fs/nfs/callback.c +3 -0
@@ -281,6 +281,9 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct ncase 1 : ret =nfs41_callback_up_net (serv, net);break ; +case 2 : + ret =nfs41_callback_up_net (serv, net); +break ;default :printk (KERN_ERR "NFS: unknown callback version: %d\n" , minorversion);
fs/nfs/nfs4client.c +5 -0
@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)if (err) goto error; +if (cl_init->minorversion >NFS4_MAX_MINOR_VERSION ) { + err = -EINVAL ; + goto error; + } +spin_lock_init (&clp->cl_lock);INIT_DELAYED_WORK (&clp->cl_renewd, nfs4_renew_state);rpc_init_wait_queue (&clp->cl_rpcwaitq,"NFS client" );
fs/nfs/nfs4proc.c +3 -0
@@ -7136,6 +7136,9 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {#if defined(CONFIG_NFS_V4_1 ) [1] = &nfs_v4_1_minor_ops,#endif +#if defined(CONFIG_NFS_V4_2 ) + [2] = &nfs_v4_1_minor_ops, +#endif };const struct inode_operations nfs4_dir_inode_operations = {
fs/nfs/super.c +6 -1
@@ -269,7 +269,7 @@ static match_table_t nfs_local_lock_tokens = {enum { Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0, - Opt_vers_4_1, + Opt_vers_4_1, Opt_vers_4_2, Opt_vers_err };
@@ -280,6 +280,7 @@ static match_table_t nfs_vers_tokens = { { Opt_vers_4, "4" }, { Opt_vers_4_0, "4.0" }, { Opt_vers_4_1, "4.1" }, + { Opt_vers_4_2, "4.2" }, { Opt_vers_err, NULL } };
@@ -1143,6 +1144,10 @@ static int nfs_parse_version_string(char *string, mnt->version =4 ; mnt->minorversion =1 ;break ; +case Opt_vers_4_2: + mnt->version =4 ; + mnt->minorversion =2 ; +break ;default :return 0 ; }
include/linux/nfs4.h +4 -0
@@ -394,11 +394,15 @@ enum lock_type4 {#define NFS4_VERSION 4#define NFS4_MINOR_VERSION 0 +#if defined(CONFIG_NFS_V4_2 ) +#define NFS4_MAX_MINOR_VERSION 2 +#else #if defined(CONFIG_NFS_V4_1 )#define NFS4_MAX_MINOR_VERSION 1#else #define NFS4_MAX_MINOR_VERSION 0#endif /* CONFIG_NFS_V4_1 */ +#endif /* CONFIG_NFS_V4_2 */ #define NFS4_DEBUG 1
Signature · 1 line
1.8.1.2
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Steve Dickson wrote:
+config NFS_V4_2
+ bool "NFS client support for NFSv4.2"
+ depends on NFS_V4_1
+ select NFS_V4_SECURITY_LABEL
+ help
+ This option enables support for minor version 1 of the NFSv4 protocol
+ in the kernel's NFS client.
+
+ If unsure, say N.
+
Shouldn't that be "enables support for minor version 2..."?
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 13 lines · Jim Rees
Steve Dickson wrote:
+config
NFS_V4_2
+ bool "NFS client support for NFSv4.2"
+ depends onNFS_V4_1
+ selectNFS_V4_SECURITY_LABEL
+ help
+ This option enables support for minor version 1 of the NFSv4 protocol
+ in the kernel's NFS client.
+
+ If unsure, say N.
+
Quoted 2 lines
Shouldn't that be "enables support for minor version 2..."?
Yes it should be... thanks!
steved.
PATCH 2/2 NFSDv4.2: Added NFS v4.2 support to the NFS server
In reply to Steve DicksonThis enable NFSv4.2 support for the server. To enable this code do the following:
echo "+4.2" >/proc/fs/nfsd/versions
after the nfsd kernel module is loaded.
--- fs/nfsd/nfs4xdr.c | 1 + fs/nfsd/nfsd.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/nfs4xdr.c +1 -0
@@ -1621,6 +1621,7 @@ struct nfsd4_minorversion_ops {static struct nfsd4_minorversion_ops nfsd4_minorversion[] = { [0 ] = { nfsd4_dec_ops,ARRAY_SIZE (nfsd4_dec_ops) }, [1 ] = { nfsd41_dec_ops,ARRAY_SIZE (nfsd41_dec_ops) }, + [2 ] = { nfsd41_dec_ops,ARRAY_SIZE (nfsd41_dec_ops) }, }; static __be32
fs/nfsd/nfsd.h +1 -1
@@ -24,7 +24,7 @@/* * nfsd version */ -#define NFSD_SUPPORTED_MINOR_VERSION 1 +#define NFSD_SUPPORTED_MINOR_VERSION 2/* * Maximum blocksizes supported by daemon under various circumstances. */
Signature · 1 line
1.8.1.2
Quoted 3 lines · Steve Dickson
These patche added v4.2 support to both the server and client. Basically the v4.1 code is reused, but the minor version is needed to enable features like label NFS.
Same comments as on previous patches.
(Sorry didn't notice there was another posting!)
--b.
Quoted 26 lines
Note, these patch apply on top of the lNFS: 3.8-rc3 release patches. Although the only conflict if applied without those patches would be in the
KconfigfilesSteve Dickson (2):
NFSv4.2: Added NFS v4.2 support to the NFS client NFSDv4.2: Added NFS v4.2 support to the NFS serverfs/nfs/Kconfig | 12 +++++++++++- fs/nfs/callback.c | 3 +++ fs/nfs/nfs4client.c | 5 +++++ fs/nfs/nfs4proc.c | 3 +++ fs/nfs/super.c | 7 ++++++- fs/nfsd/nfs4xdr.c | 1 + fs/nfsd/nfsd.h | 2 +- include/linux/nfs4.h | 4 ++++ 8 files changed, 34 insertions(+), 3 deletions(-)Signature · 6 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html