Return-Path: linux-nfs-owner@vger.kernel.org Received: from fieldses.org ([174.143.236.118]:50392 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758403Ab3DXWC3 (ORCPT ); Wed, 24 Apr 2013 18:02:29 -0400 Date: Wed, 24 Apr 2013 18:02:26 -0400 To: Steve Dickson Cc: Trond Myklebust , "J. Bruce Fields" , "David P. Quigley" , Linux NFS list , Linux FS devel list , Linux Security List , SELinux List Subject: Re: [PATCH 03/17] NFSDv4.2: Added NFS v4.2 support to the NFS server Message-ID: <20130424220226.GN20275@fieldses.org> References: <1366834683-29075-1-git-send-email-SteveD@redhat.com> <1366834683-29075-4-git-send-email-SteveD@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1366834683-29075-4-git-send-email-SteveD@redhat.com> From: "J. Bruce Fields" Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, Apr 24, 2013 at 04:17:49PM -0400, Steve Dickson wrote: > From: Steve Dickson > > This 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. > > Signed-off-by: Steve Dickson > --- > fs/nfsd/nfs4xdr.c | 1 + > fs/nfsd/nfsd.h | 7 ++++++- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > index a272007..b38de7a 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -1572,6 +1572,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 > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > index 553b230..b5eade7 100644 > --- a/fs/nfsd/nfsd.h > +++ b/fs/nfsd/nfsd.h > @@ -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. > */ These last two chunks belong with a later patch, whenever we make other 4.2 attribute changes: --b. > @@ -328,6 +328,8 @@ void nfsd_lockd_shutdown(void); > #define NFSD4_1_SUPPORTED_ATTRS_WORD2 \ > (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT) > > +#define NFSD4_2_SUPPORTED_ATTRS_WORD2 0 > + > static inline u32 nfsd_suppattrs0(u32 minorversion) > { > return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0 > @@ -342,6 +344,9 @@ static inline u32 nfsd_suppattrs1(u32 minorversion) > > static inline u32 nfsd_suppattrs2(u32 minorversion) > { > + if (minorversion == 2) > + return NFSD4_2_SUPPORTED_ATTRS_WORD2; > + > return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2 > : NFSD4_SUPPORTED_ATTRS_WORD2; > } > -- > 1.8.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html