| Message ID | 1364939160-20874-20-git-send-email-SteveD@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 02, 2013 at 05:46:00PM -0400, Steve Dickson wrote: > From: Steve Dickson <steved@redhat.com> > > This enable NFSv4.2 support for the server. To enable this > code do the following: > echo "+4.2" >/proc/fs/nfsd/versions The patches are ordered strangely: labeled nFS support depends on 4.2 support, so we should be adding 4.2 support first, then labeled NFS support on top of that. Note a 4.1 client shouldn't see the server return the new attribute as supported unless it's using 4.2, and attempts to set it should error out unless it's using 4.2. --b. > > after the nfsd kernel module is loaded. > > Signed-off-by: Steve Dickson <steved@redhat.com> > --- > fs/nfsd/nfs4xdr.c | 1 + > fs/nfsd/nfsd.h | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > index 818c1ca..d40b6ac 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -1628,6 +1628,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 3090561..ac518e4 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. > */ > -- > 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
On 10/04/13 11:25, J. Bruce Fields wrote: > On Tue, Apr 02, 2013 at 05:46:00PM -0400, Steve Dickson wrote: >> From: Steve Dickson <steved@redhat.com> >> >> This enable NFSv4.2 support for the server. To enable this >> code do the following: >> echo "+4.2" >/proc/fs/nfsd/versions > > The patches are ordered strangely: labeled nFS support depends on 4.2 > support, so we should be adding 4.2 support first, then labeled NFS > support on top of that. Seriously that actually matter? So you want just commit the 4.2 and not not the label NFS patches? > > Note a 4.1 client shouldn't see the server return the new attribute as > supported unless it's using 4.2, and attempts to set it should error > out unless it's using 4.2. How is that handled with 4.0 vers 4.1? Just looking for a point to the code... steved. > > --b. > >> >> after the nfsd kernel module is loaded. >> >> Signed-off-by: Steve Dickson <steved@redhat.com> >> --- >> fs/nfsd/nfs4xdr.c | 1 + >> fs/nfsd/nfsd.h | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c >> index 818c1ca..d40b6ac 100644 >> --- a/fs/nfsd/nfs4xdr.c >> +++ b/fs/nfsd/nfs4xdr.c >> @@ -1628,6 +1628,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 3090561..ac518e4 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. >> */ >> -- >> 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
On Wed, Apr 10, 2013 at 11:58:27AM -0400, Steve Dickson wrote: > > > On 10/04/13 11:25, J. Bruce Fields wrote: > > On Tue, Apr 02, 2013 at 05:46:00PM -0400, Steve Dickson wrote: > >> From: Steve Dickson <steved@redhat.com> > >> > >> This enable NFSv4.2 support for the server. To enable this > >> code do the following: > >> echo "+4.2" >/proc/fs/nfsd/versions > > > > The patches are ordered strangely: labeled nFS support depends on 4.2 > > support, so we should be adding 4.2 support first, then labeled NFS > > support on top of that. > Seriously that actually matter? So you want just commit the 4.2 and not > not the label NFS patches? Yes, please, let's get that fixed on both the client and server, even though, yes I expect we'll probably commit them all at once. > > Note a 4.1 client shouldn't see the server return the new attribute as > > supported unless it's using 4.2, and attempts to set it should error > > out unless it's using 4.2. > How is that handled with 4.0 vers 4.1? Just looking for a point to the code... I don't actually remember. Grepping around.... Looks like it's mainly the nfsd_suppattrs{0,1,2} functions in fs/nfsd/nfsd.h. --b. -- 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
On 10/04/13 16:12, J. Bruce Fields wrote: > On Wed, Apr 10, 2013 at 11:58:27AM -0400, Steve Dickson wrote: >> >> >> On 10/04/13 11:25, J. Bruce Fields wrote: >>> On Tue, Apr 02, 2013 at 05:46:00PM -0400, Steve Dickson wrote: >>>> From: Steve Dickson <steved@redhat.com> >>>> >>>> This enable NFSv4.2 support for the server. To enable this >>>> code do the following: >>>> echo "+4.2" >/proc/fs/nfsd/versions >>> >>> The patches are ordered strangely: labeled nFS support depends on 4.2 >>> support, so we should be adding 4.2 support first, then labeled NFS >>> support on top of that. >> Seriously that actually matter? So you want just commit the 4.2 and not >> not the label NFS patches? > > Yes, please, let's get that fixed on both the client and server, even > though, yes I expect we'll probably commit them all at once. > >>> Note a 4.1 client shouldn't see the server return the new attribute as >>> supported unless it's using 4.2, and attempts to set it should error >>> out unless it's using 4.2. >> How is that handled with 4.0 vers 4.1? Just looking for a point to the code... > I don't actually remember. Grepping around.... Looks like it's mainly > the nfsd_suppattrs{0,1,2} functions in fs/nfsd/nfsd.h. Thanks! steved. -- 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
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 818c1ca..d40b6ac 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1628,6 +1628,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 3090561..ac518e4 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. */