On Fri, 2013-02-22 at 10:28 -0500, J. Bruce Fields wrote: > On Thu, Feb 21, 2013 at 06:13:40PM -0500, Steve Dickson wrote: > > > > > > On 21/02/13 17:22, Myklebust, Trond wrote: > > > On Thu, 2013-02-21 at 17:15 -0500, Steve Dickson wrote: > > >> > 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. > > >> > > > >> > Signed-off-by: Steve Dickson <steved@xxxxxxxxxx> > > >> > --- > > >> > 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(-) > > >> > > > >> > diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig > > >> > index 3861a1f..247db6d 100644 > > >> > --- a/fs/nfs/Kconfig > > >> > +++ b/fs/nfs/Kconfig > > >> > @@ -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 > > > Just have NFS_V4_SECURITY_LABEL be automatically selected by NFS_V4_2. > > > Requiring users to manually select both makes little sense... > > > > > > > > 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. 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. -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@xxxxxxxxxx www.netapp.com -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html