NFS v4.2 support to both the server and client
Subsystems (2)
cover NFS v4.2 support to both the server and client
This is the first attempt to 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.
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 | 11 ++++++++++- 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, 33 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 | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)
fs/nfs/Kconfig +10 -1
@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1
@@ -133,7 +142,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
Quoted 35 lines · Steve Dickson
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +9
-0@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1
fs/nfs/Kconfig config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN · line 146
Quoted 6 lines
fs/nfs/Kconfig +1
-1@@ -133,7 +142,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
Just have NFS_V4_SECURITY_LABEL be automatically selected by NFS_V4_2. Requiring users to manually select both makes little sense...
fs/nfs/callback.c static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n · line 281
Quoted 7 lines
fs/nfs/Kconfig +0
-0Say Y here if you want enable fine-grained security label attributefs/nfs/callback.c +0
-0@@ -281,6 +281,9 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct ncase 1 :
case 2:
Quoted 90 lines
fs/nfs/callback.c +3
-0ret =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 · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 37 lines · Trond
Quoted 36 lines · Steve Dickson
Quoted 36 lines
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +9
-0@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
Quoted 9 lines
Quoted 5 lines
fs/nfs/Kconfig config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN · line 146
Quoted 5 lines
fs/nfs/Kconfig +1
-1config NFS_V4_SECURITY_LABEL bool "Provide Security Label support for NFSv4 client" - depends on NFS_V4 && SECURITY + depends on NFS_V4_2 && SECURITY helpJust have
NFS_V4_SECURITY_LABELbe automatically selected byNFS_V4_2. Requiring users to manually select both makes little sense...
Yeah... that make sense...
steved.
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 49 lines · Steve Dickson
Quoted 37 lines · Trond
Quoted 36 lines · Steve Dickson
Quoted 36 lines
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +9
-0@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAINQuoted 9 lines
Quoted 5 lines
fs/nfs/Kconfig config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN · line 146
Quoted 5 lines
fs/nfs/Kconfig +1
-1config NFS_V4_SECURITY_LABEL bool "Provide Security Label support for NFSv4 client" - depends on NFS_V4 && SECURITY + depends on NFS_V4_2 && SECURITY helpJust have
NFS_V4_SECURITY_LABELbe automatically selected byNFS_V4_2. Requiring users to manually select both makes little sense...
Quoted 1 line
Yeah... that make sense...
Why do we even need the two config options (both NFS_SECURITY_LABEL and NFS_V4_2)? Until we have more 4.2 features it seems redundant.
--b.
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 50 lines · J. Bruce Fields
Quoted 49 lines · Steve Dickson
Quoted 46 lines · Trond
Quoted 36 lines · Steve Dickson
Quoted 36 lines
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +9
-0@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAINQuoted 5 lines
fs/nfs/Kconfig config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN · line 146
Quoted 5 lines
fs/nfs/Kconfig +1
-1config NFS_V4_SECURITY_LABEL bool "Provide Security Label support for NFSv4 client" - depends on NFS_V4 && SECURITY + depends on NFS_V4_2 && SECURITY helpJust have
NFS_V4_SECURITY_LABELbe automatically selected byNFS_V4_2. Requiring users to manually select both makes little sense...
Quoted 4 lines
Quoted 1 line
Yeah... that make sense...
Why do we even need the two config options (both
NFS_SECURITY_LABELandNFS_V4_2)? Until we have more 4.2 features it seems redundant.
Not really. CONFIG_NFS_SECURITY_LABEL has a dependency on CONFIG_SECURITY that I don't expect copy offload and other future NFSv4.2 features to have.
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
In reply to Steve DicksonQuoted 62 lines · Steve Dickson
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +10
-1@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,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 attributefs/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 +0
-0
fs/nfs/nfs4client.c struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) · line 72
Quoted 7 lines
fs/nfs/nfs4client.c +4
-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; + }
Why wasn't this check needed before?
Quoted 9 lines
fs/nfs/nfs4client.c +1
-0+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 +0
-0
fs/nfs/nfs4proc.c const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { · line 7140
Quoted 5 lines
fs/nfs/nfs4proc.c +2
-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,
But then nfs_v4_minor_ops[2]->minor_version = 1.
I think you want to create another structure--just define an nfs_v4_2_minor_ops field that's the same as nfs_v4_1_minor_ops except for the minor_version field.
--b.
Quoted 59 lines
fs/nfs/nfs4proc.c +1
-0+#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 1Signature · 1 line
1.8.1.2
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 66 lines · J. Bruce Fields
Quoted 65 lines · Steve Dickson
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +10
-1@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,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 attributefs/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 +0
-0@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)if (err) goto error;
Quoted 6 lines
fs/nfs/nfs4client.c struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) · line 72
Quoted 4 lines
fs/nfs/nfs4client.c +4
-0+if (cl_init->minorversion >NFS4_MAX_MINOR_VERSION ) { + err = -EINVAL ; + goto error; + }Why wasn't this check needed before?
It was not needed because the checks in nfs_parse_version_string caught the mismatch minor version... but since minor version 2 is no longer a mismatch and those checks in nfs_parse_version_string are not covered by an ifdef this check is now needed...
Quoted 18 lines
Quoted 10 lines
fs/nfs/nfs4client.c +1
-0+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 +0
-0fs/nfs/nfs4proc.c const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { · line 7140
Quoted 5 lines
fs/nfs/nfs4proc.c +2
-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,But then nfs_v4_minor_ops[2]->minor_version = 1.
Quoted 3 lines
I think you want to create another structure--just define an
nfs_v4_2_minor_opsfield that's the same asnfs_v4_1_minor_opsexcept for theminor_versionfield.
That's how I started out:
#if defined(CONFIG_NFS_V4_2)
static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = {
.minor_version = 2,
.call_sync = nfs4_call_sync_sequence, .match_stateid = nfs41_match_stateid, .find_root_sec = nfs41_find_root_sec, .reboot_recovery_ops = &nfs41_reboot_recovery_ops, .nograce_recovery_ops = &nfs41_nograce_recovery_ops, .state_renewal_ops = &nfs41_state_renewal_ops,
};
#endif
but it just seem like such a big waste of space... I could switch back...
Trond??
steved.
Quoted 62 lines
--b.
Quoted 59 lines
fs/nfs/nfs4proc.c +1
-0+#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 1Signature · 1 line
1.8.1.2
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 75 lines · Steve Dickson
Quoted 66 lines · J. Bruce Fields
Quoted 65 lines · Steve Dickson
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +10
-1@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,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 attributefs/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 +0
-0@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)if (err) goto error;Quoted 6 lines
fs/nfs/nfs4client.c struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) · line 72
Quoted 4 lines
fs/nfs/nfs4client.c +4
-0+if (cl_init->minorversion >NFS4_MAX_MINOR_VERSION ) { + err = -EINVAL ; + goto error; + }Why wasn't this check needed before?
Quoted 4 lines
It was not needed because the checks in
nfs_parse_version_stringcaught the mismatch minor version... but since minor version 2 is no longer a mismatch and those checks innfs_parse_version_stringare not covered by an ifdef this check is now needed...
NFSv4.1 could be configured out too. How did it manage to return an error for minorversion == 1 in the !CONFIG_NFS_V4_1 case before?
Quoted 34 lines
Quoted 17 lines
Quoted 9 lines
fs/nfs/nfs4client.c +1
-0+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 +0
-0fs/nfs/nfs4proc.c const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { · line 7140
Quoted 5 lines
fs/nfs/nfs4proc.c +2
-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,But then nfs_v4_minor_ops[2]->minor_version = 1.
Quoted 3 lines
I think you want to create another structure--just define an
nfs_v4_2_minor_opsfield that's the same asnfs_v4_1_minor_opsexcept for theminor_versionfield.That's how I started out:
#if
defined(CONFIG_NFS_V4_2)
static const structnfs4_minor_version_opsnfs_v4_2_minor_ops= {
.minor_version = 2,
.call_sync =nfs4_call_sync_sequence, .match_stateid =nfs41_match_stateid, .find_root_sec =nfs41_find_root_sec, .reboot_recovery_ops =&nfs41_reboot_recovery_ops, .nograce_recovery_ops =&nfs41_nograce_recovery_ops, .state_renewal_ops =&nfs41_state_renewal_ops,
};
#endif
Quoted 1 line
but it just seem like such a big waste of space...
Correctness first....
--b.
Quoted 1 line
I could switch back...
Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client
Quoted 76 lines · J. Bruce Fields
Quoted 75 lines · Steve Dickson
Quoted 72 lines · J. Bruce Fields
Quoted 62 lines · Steve Dickson
This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2Kconfigdefine needs to be set and the -o v4.2 mount option need to be used.Signed-off-by Steve Dickson <[email protected]>--- fs/nfs/Kconfig | 11 ++++++++++- 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, 31 insertions(+), 2 deletions(-)fs/nfs/Kconfig +10
-1@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + (RFC 5661) in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1@@ -133,7 +142,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 attributefs/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 +0
-0fs/nfs/nfs4client.c struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) · line 72
Quoted 7 lines
fs/nfs/nfs4client.c +4
-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; + }Why wasn't this check needed before?
Quoted 7 lines
Quoted 4 lines
It was not needed because the checks in
nfs_parse_version_stringcaught the mismatch minor version... but since minor version 2 is no longer a mismatch and those checks innfs_parse_version_stringare not covered by an ifdef this check is now needed...NFSv4.1 could be configured out too. How did it manage to return an error for minorversion == 1 in the !CONFIG_NFS_V4_1 case before?
Never tested?? I can't say... but this was the very first oops when I enabled the 4.2 parsing...
Quoted 35 lines
Quoted 35 lines
Quoted 18 lines
Quoted 10 lines
fs/nfs/nfs4client.c +1
-0+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 +0
-0fs/nfs/nfs4proc.c const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { · line 7140
Quoted 5 lines
fs/nfs/nfs4proc.c +2
-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,But then nfs_v4_minor_ops[2]->minor_version = 1.
Quoted 3 lines
I think you want to create another structure--just define an
nfs_v4_2_minor_opsfield that's the same asnfs_v4_1_minor_opsexcept for theminor_versionfield.That's how I started out:
#if
defined(CONFIG_NFS_V4_2)
static const structnfs4_minor_version_opsnfs_v4_2_minor_ops= {
.minor_version = 2,
.call_sync =nfs4_call_sync_sequence, .match_stateid =nfs41_match_stateid, .find_root_sec =nfs41_find_root_sec, .reboot_recovery_ops =&nfs41_reboot_recovery_ops, .nograce_recovery_ops =&nfs41_nograce_recovery_ops, .state_renewal_ops =&nfs41_state_renewal_ops,
};
#endif
Quoted 3 lines
Quoted 1 line
but it just seem like such a big waste of space...
Correctness first....
Fine... new version on the way...
steved.
Quoted 4 lines
--b.
Quoted 1 line
I could switch back...
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
Re: [PATCH 2/2] NFSDv4.2: Added NFS v4.2 support to the NFS server
Quoted 29 lines · Steve Dickson
This enable NFSv4.2 support for the server. To enable this code do the following:
echo "+4.2" >/proc/fs/nfsd/versionsafter the nfsd kernel module is loaded.
Signed-off-by Steve Dickson <[email protected]>--- 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 __be32fs/nfsd/nfsd.h +0
-0
fs/nfsd/nfsd.h line 30
Quoted 8 lines
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. */
Looks OK to me, except this should be behind a config for now.
On a grep for "minorversion" I notice two oversights, below: one just a comment, one might result in getting the wrong minorversion on callbacks.
--b.
fs/nfsd/nfs4state.c +1 -1
@@ -1665,7 +1665,7 @@ out_new: status = nfserr_jukebox; goto out; } - new->cl_minorversion =1 ; + new->cl_minorversion = cstate->minorversion;gen_clid (new);add_to_unconfirmed (new, strhashval);
fs/nfsd/state.h +1 -1
@@ -108,7 +108,7 @@ struct nfs4_cb_conn {u32 cb_prog;/* used only in 4.0 case; per-session otherwise */ u32 cb_ident;/* minorversion 0 only */ -struct svc_xprt *cb_xprt;/* minorversion 1 only */ +struct svc_xprt *cb_xprt;/* minorversion >=1 only */ };static inline struct nfs4_delegation *delegstateid (struct nfs4_stid *s)
Re: [PATCH 2/2] NFSDv4.2: Added NFS v4.2 support to the NFS server
Quoted 65 lines · J. Bruce Fields
Quoted 29 lines · Steve Dickson
This enable NFSv4.2 support for the server. To enable this code do the following:
echo "+4.2" >/proc/fs/nfsd/versionsafter the nfsd kernel module is loaded.
Signed-off-by Steve Dickson <[email protected]>--- 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 __be32fs/nfsd/nfsd.h +0
-0fs/nfsd/nfsd.h line 30
Quoted 8 lines
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. */ Looks OK to me, except this should be behind a config for now.
On a grep for "minorversion" I notice two oversights, below: one just a comment, one might result in getting the wrong minorversion on callbacks.
--b.
fs/nfsd/nfs4state.c +1
-1@@ -1665,7 +1665,7 @@ out_new: status = nfserr_jukebox; goto out; } - new->cl_minorversion =1 ; + new->cl_minorversion = cstate->minorversion;gen_clid (new);add_to_unconfirmed (new, strhashval);fs/nfsd/state.h +0
-0
fs/nfsd/state.h struct nfs4_cb_conn { · line 111
Quoted 5 lines
fs/nfsd/state.h +1
-1@@ -108,7 +108,7 @@ struct nfs4_cb_conn {u32 cb_prog;/* used only in 4.0 case; per-session otherwise */ u32 cb_ident;/* minorversion 0 only */ -struct svc_xprt *cb_xprt;/* minorversion 1 only */ +struct svc_xprt *cb_xprt;/* minorversion >=1 only */
Tagging things as being particlar to a give minorversion means that we'll never stop having to change the comments. Why not just label it as being the session back channel?
Quoted 3 lines
fs/nfsd/state.h +0
-0};static inline struct nfs4_delegation *delegstateid (struct nfs4_stid *s)
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com
Re: [PATCH 2/2] NFSDv4.2: Added NFS v4.2 support to the NFS server
Quoted 59 lines · Trond
Quoted 58 lines · J. Bruce Fields
Quoted 29 lines · Steve Dickson
This enable NFSv4.2 support for the server. To enable this code do the following:
echo "+4.2" >/proc/fs/nfsd/versionsafter the nfsd kernel module is loaded.
Signed-off-by Steve Dickson <[email protected]>--- 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 __be32fs/nfsd/nfsd.h +0
-0fs/nfsd/nfsd.h line 30
Quoted 8 lines
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. */ Looks OK to me, except this should be behind a config for now.
On a grep for "minorversion" I notice two oversights, below: one just a comment, one might result in getting the wrong minorversion on callbacks.
--b.
fs/nfsd/nfs4state.c +1
-1@@ -1665,7 +1665,7 @@ out_new: status = nfserr_jukebox; goto out; } - new->cl_minorversion =1 ; + new->cl_minorversion = cstate->minorversion;
Quoted 15 lines
fs/nfsd/state.h struct nfs4_cb_conn { · line 111
Quoted 12 lines
fs/nfsd/nfs4state.c +0
-0gen_clid (new);add_to_unconfirmed (new, strhashval);fs/nfsd/state.h +1
-1@@ -108,7 +108,7 @@ struct nfs4_cb_conn {u32 cb_prog;/* used only in 4.0 case; per-session otherwise */ u32 cb_ident;/* minorversion 0 only */ -struct svc_xprt *cb_xprt;/* minorversion 1 only */ +struct svc_xprt *cb_xprt;/* minorversion >=1 only */ Tagging things as being particlar to a give minorversion means that we'll never stop having to change the comments.
I don't see how "minorversion >=1 only" is likely to become untrue. Are we really expecting to remove the session back channel in a future minor version?
Quoted 1 line
Why not just label it as being the session back channel?
I don't really care. Happy to take alternate text if you want to suggest something.
--b.