rpc.nfsd: No longer advertise NFS v2 support.
Subsystems (2)
PATCH 1/2 rpc.nfsd: No longer advertise NFS v2 support.
Changed the default protocol versions that rpc.nfsd register with rpcbind to just 3 and 4. Version 2 can still be enabled with the '-V' flag, but it will not be on by default.
--- support/include/nfs/nfs.h | 1 + utils/nfsd/nfsd.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
support/include/nfs/nfs.h +1 -0
@@ -52,6 +52,7 @@ struct nfs_fh_old {#define NFSCTL_UDPISSET (_cltbits) ((_cltbits) & NFSCTL_UDPBIT)#define NFSCTL_TCPISSET (_cltbits) ((_cltbits) & NFSCTL_TCPBIT) +#define NFSCTL_VERDEFAULT (0xc)/* versions 3 and 4 */ #define NFSCTL_VERSET (_cltbits, _v) ((_cltbits) |= (1 << ((_v) - 1)))#define NFSCTL_UDPSET (_cltbits) ((_cltbits) |= NFSCTL_UDPBIT)#define NFSCTL_TCPSET (_cltbits) ((_cltbits) |= NFSCTL_TCPBIT)
utils/nfsd/nfsd.c +1 -1
@@ -100,7 +100,7 @@ main(int argc, char **argv)char *haddr =NULL ;int socket_up =0 ;int minorvers41 =0 ;/* nfsv4 minor version */ -unsigned int versbits =NFSCTL_ALLBITS ; +unsigned int versbits =NFSCTL_VERDEFAULT ;unsigned int protobits =NFSCTL_ALLBITS ;unsigned int proto4 =0 ;unsigned int proto6 =0 ;
Signature · 1 line
1.8.1.4
PATCH 2/2 rpc.nfsd: Allow v4.2 server support with the -V option
--- support/include/nfs/nfs.h | 4 ++++ utils/nfsd/nfsd.c | 12 ++++++------ utils/nfsd/nfssvc.c | 11 +++++++---- 3 files changed, 17 insertions(+), 10 deletions(-)
support/include/nfs/nfs.h +4 -0
@@ -15,6 +15,10 @@#define NFSD_MINVERS 2#define NFSD_MAXVERS 4 +#define NFS4_MINMINOR 1 +#define NFS4_MAXMINOR 2 +#define NFS4_VERDEFAULT 0x1/* minor verion 1 */ +struct nfs_fh_len {int fh_size;u_int8_t fh_handle[NFS3_FHSIZE ];
utils/nfsd/nfsd.c +6 -6
@@ -99,7 +99,7 @@ main(int argc, char **argv)char *p, *progname, *port;char *haddr =NULL ;int socket_up =0 ; -int minorvers41 =0 ;/* nfsv4 minor version */ +int minorvers =NFS4_VERDEFAULT ;/* nfsv4 minor version */ unsigned int versbits =NFSCTL_VERDEFAULT ;unsigned int protobits =NFSCTL_ALLBITS ;unsigned int proto4 =0 ;
@@ -160,11 +160,11 @@ main(int argc, char **argv)case 4 :if (*p =='.' ) {int i =atoi (p+1 ); -if (i !=1 ) { +if (i >2 ) {fprintf (stderr,"%s: unsupported minor version\n" , optarg);exit (1 ); } - minorvers41 =-1 ; +NFSCTL_VERUNSET (minorvers, i);break ; }case 3 :
@@ -181,11 +181,11 @@ main(int argc, char **argv)case 4 :if (*p =='.' ) {int i =atoi (p+1 ); -if (i !=1 ) { +if (i >2 ) {fprintf (stderr,"%s: unsupported minor version\n" , optarg);exit (1 ); } - minorvers41 =1 ; +NFSCTL_VERSET (minorvers, i);break ; }case 3 :
@@ -282,7 +282,7 @@ main(int argc, char **argv)* registered with rpcbind. Note that on older kernels w/o the right * interfaces, these are a no-op. */ -nfssvc_setvers (versbits, minorvers41); +nfssvc_setvers (versbits, minorvers); error =nfssvc_set_sockets (AF_INET , proto4, haddr, port);if (!error)
utils/nfsd/nfssvc.c +7 -4
@@ -269,7 +269,7 @@ nfssvc_set_sockets(const int family, const unsigned int protobits, }void -nfssvc_setvers (unsigned int ctlbits,int minorvers41) +nfssvc_setvers (unsigned int ctlbits,int minorvers) {int fd, n, off;char *ptr;
@@ -280,9 +280,12 @@ nfssvc_setvers(unsigned int ctlbits, int minorvers41)if (fd <0 )return ; -if (minorvers41) - off +=snprintf (ptr+off,sizeof (buf) - off,"%c4.1" , - minorvers41 >0 ?'+' :'-' ); +for (n =NFS4_MINMINOR ; n <=NFS4_MAXMINOR ; n++) { +if (NFSCTL_VERISSET (minorvers, n)) + off +=snprintf (ptr+off,sizeof (buf) - off,"+4.%d " , n); +else + off +=snprintf (ptr+off,sizeof (buf) - off,"-4.%d " , n); + }for (n =NFSD_MINVERS ; n <=NFSD_MAXVERS ; n++) {if (NFSCTL_VERISSET (ctlbits, n)) off +=snprintf (ptr+off,sizeof (buf) - off,"+%d " , n);
Signature · 1 line
1.8.1.4
Re: [PATCH 2/2] rpc.nfsd: Allow v4.2 server support with the -V option
Quoted 1 line · Steve Dickson
Signed-off-by Steve Dickson <[email protected]>
I agree that we want to be able to turn on 4.2 support with -V, but this does more than that:
utils/nfsd/nfssvc.c nfssvc_setvers(unsigned int ctlbits, int minorvers41) · line 291
Quoted 12 lines
utils/nfsd/nfssvc.c +6
-3-if (minorvers41) - off +=snprintf (ptr+off,sizeof (buf) - off,"%c4.1" , - minorvers41 >0 ?'+' :'-' ); +for (n =NFS4_MINMINOR ; n <=NFS4_MAXMINOR ; n++) { +if (NFSCTL_VERISSET (minorvers, n)) + off +=snprintf (ptr+off,sizeof (buf) - off,"+4.%d " , n); +else + off +=snprintf (ptr+off,sizeof (buf) - off,"-4.%d " , n); + }for (n =NFSD_MINVERS ; n <=NFSD_MAXVERS ; n++) {if (NFSCTL_VERISSET (ctlbits, n)) off +=snprintf (ptr+off,sizeof (buf) - off,"+%d " , n);
Previously minorvers41 could be set to:
1: turn on 4.1 -1: turn off 4.1 0: keep kernel default (user didn't specify)
This patch removes the "0" case, which I liked.
--b.
Re: [PATCH 2/2] rpc.nfsd: Allow v4.2 server support with the -V option
T24gVHVlLCAyMDEzLTA3LTMwIGF0IDExOjU5IC0wNDAwLCBKLiBCcnVjZSBGaWVsZHMgd3JvdGU6 DQo+IE9uIFN1biwgSnVsIDI4LCAyMDEzIGF0IDAyOjM2OjM4UE0gLTA0MDAsIFN0ZXZlIERpY2tz b24gd3JvdGU6DQo+ID4gU2lnbmVkLW9mZi1ieTogU3RldmUgRGlja3NvbiA8c3RldmVkQHJlZGhh dC5jb20+DQo+IA0KPiBJIGFncmVlIHRoYXQgd2Ugd2FudCB0byBiZSBhYmxlIHRvIHR1cm4gb24g NC4yIHN1cHBvcnQgd2l0aCAtViwgYnV0IHRoaXMNCj4gZG9lcyBtb3JlIHRoYW4gdGhhdDoNCj4g DQo+ID4gLQlpZiAobWlub3J2ZXJzNDEpDQo+ID4gLQkJb2ZmICs9IHNucHJpbnRmKHB0citvZmYs IHNpemVvZihidWYpIC0gb2ZmLCAiJWM0LjEiLA0KPiA+IC0JCQkJbWlub3J2ZXJzNDEgPiAwID8g JysnIDogJy0nKTsNCj4gPiArCWZvciAobiA9IE5GUzRfTUlOTUlOT1I7IG4gPD0gTkZTNF9NQVhN SU5PUjsgbisrKSB7DQo+ID4gKwkJaWYgKE5GU0NUTF9WRVJJU1NFVChtaW5vcnZlcnMsIG4pKSAN Cj4gPiArCQkJb2ZmICs9IHNucHJpbnRmKHB0citvZmYsIHNpemVvZihidWYpIC0gb2ZmLCAiKzQu JWQgIiwgbik7DQo+ID4gKwkJZWxzZQkJCQ0KPiA+ICsJCQlvZmYgKz0gc25wcmludGYocHRyK29m Ziwgc2l6ZW9mKGJ1ZikgLSBvZmYsICItNC4lZCAiLCBuKTsNCj4gPiArCX0NCj4gPiAgCWZvciAo biA9IE5GU0RfTUlOVkVSUzsgbiA8PSBORlNEX01BWFZFUlM7IG4rKykgew0KPiA+ICAJCWlmIChO RlNDVExfVkVSSVNTRVQoY3RsYml0cywgbikpDQo+ID4gIAkJICAgIG9mZiArPSBzbnByaW50Zihw dHIrb2ZmLCBzaXplb2YoYnVmKSAtIG9mZiwgIislZCAiLCBuKTsNCj4gDQo+IFByZXZpb3VzbHkg bWlub3J2ZXJzNDEgY291bGQgYmUgc2V0IHRvOg0KPiANCj4gCSAxOiB0dXJuIG9uIDQuMQ0KPiAJ LTE6IHR1cm4gb2ZmIDQuMQ0KPiAJIDA6IGtlZXAga2VybmVsIGRlZmF1bHQgKHVzZXIgZGlkbid0 IHNwZWNpZnkpDQo+IA0KPiBUaGlzIHBhdGNoIHJlbW92ZXMgdGhlICIwIiBjYXNlLCB3aGljaCBJ IGxpa2VkLg0KDQpXaHkgc2hvdWxkIE5GU3Y0IG1pbm9yIHZlcnNpb25zIGJlIHRyZWF0ZWQgYW55 IGRpZmZlcmVudGx5IGZyb20gbWFqb3INCnZlcnNpb25zIGhlcmU/IFdlIGRvbid0IGhhdmUgYSAn a2VybmVsIGRlZmF1bHQnIGZvciBORlN2MiBvciB2MyBvciB2NC4wLg0KDQotLSANClRyb25kIE15 a2xlYnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFpbmVyDQoNCk5ldEFwcA0KVHJvbmQuTXlr bGVidXN0QG5ldGFwcC5jb20NCnd3dy5uZXRhcHAuY29tDQo=
Re: [PATCH 2/2] rpc.nfsd: Allow v4.2 server support with the -V option
Quoted 22 lines · Trond
Quoted 21 lines · J. Bruce Fields
Quoted 1 line · Steve Dickson
Signed-off-by Steve Dickson <[email protected]>I agree that we want to be able to turn on 4.2 support with -V, but this does more than that:
utils/nfsd/nfssvc.c nfssvc_setvers(unsigned int ctlbits, int minorvers41) · line 291
Quoted 12 lines
utils/nfsd/nfssvc.c +6
-3-if (minorvers41) - off +=snprintf (ptr+off,sizeof (buf) - off,"%c4.1" , - minorvers41 >0 ?'+' :'-' ); +for (n =NFS4_MINMINOR ; n <=NFS4_MAXMINOR ; n++) { +if (NFSCTL_VERISSET (minorvers, n)) + off +=snprintf (ptr+off,sizeof (buf) - off,"+4.%d " , n); +else + off +=snprintf (ptr+off,sizeof (buf) - off,"-4.%d " , n); + }for (n =NFSD_MINVERS ; n <=NFSD_MAXVERS ; n++) {if (NFSCTL_VERISSET (ctlbits, n)) off +=snprintf (ptr+off,sizeof (buf) - off,"+%d " , n);Previously minorvers41 could be set to:
Quoted 8 lines
Quoted 5 lines
1: turn on 4.1 -1: turn off 4.1 0: keep kernel default (user didn't specify)This patch removes the "0" case, which I liked.
Why should NFSv4 minor versions be treated any differently from major versions here? We don't have a 'kernel default' for NFSv2 or v3 or v4.0.
I think "run the highest minorversion currently considered sufficiently mature" is a useful option.
I don't know why that wasn't done for earlier versions.
--b.
Re: [PATCH 2/2] rpc.nfsd: Allow v4.2 server support with the -V option
In reply to Steve DicksonQuoted 6 lines · Steve Dickson
Signed-off-by Steve Dickson <[email protected]>--- support/include/nfs/nfs.h | 4 ++++ utils/nfsd/nfsd.c | 12 ++++++------ utils/nfsd/nfssvc.c | 11 +++++++---- 3 files changed, 17 insertions(+), 10 deletions(-)
Committed...
steved.
Quoted 96 lines
support/include/nfs/nfs.h +4
-0@@ -15,6 +15,10 @@#define NFSD_MINVERS 2#define NFSD_MAXVERS 4 +#define NFS4_MINMINOR 1 +#define NFS4_MAXMINOR 2 +#define NFS4_VERDEFAULT 0x1/* minor verion 1 */ +struct nfs_fh_len {int fh_size;u_int8_t fh_handle[NFS3_FHSIZE ];utils/nfsd/nfsd.c +6
-6@@ -99,7 +99,7 @@ main(int argc, char **argv)char *p, *progname, *port;char *haddr =NULL ;int socket_up =0 ; -int minorvers41 =0 ;/* nfsv4 minor version */ +int minorvers =NFS4_VERDEFAULT ;/* nfsv4 minor version */ unsigned int versbits =NFSCTL_VERDEFAULT ;unsigned int protobits =NFSCTL_ALLBITS ;unsigned int proto4 =0 ;@@ -160,11 +160,11 @@ main(int argc, char **argv)case 4 :if (*p =='.' ) {int i =atoi (p+1 ); -if (i !=1 ) { +if (i >2 ) {fprintf (stderr,"%s: unsupported minor version\n" , optarg);exit (1 ); } - minorvers41 =-1 ; +NFSCTL_VERUNSET (minorvers, i);break ; }case 3 :@@ -181,11 +181,11 @@ main(int argc, char **argv)case 4 :if (*p =='.' ) {int i =atoi (p+1 ); -if (i !=1 ) { +if (i >2 ) {fprintf (stderr,"%s: unsupported minor version\n" , optarg);exit (1 ); } - minorvers41 =1 ; +NFSCTL_VERSET (minorvers, i);break ; }case 3 :@@ -282,7 +282,7 @@ main(int argc, char **argv)* registered with rpcbind. Note that on older kernels w/o the right * interfaces, these are a no-op. */ -nfssvc_setvers (versbits, minorvers41); +nfssvc_setvers (versbits, minorvers); error =nfssvc_set_sockets (AF_INET , proto4, haddr, port);if (!error)utils/nfsd/nfssvc.c +7
-4@@ -269,7 +269,7 @@ nfssvc_set_sockets(const int family, const unsigned int protobits, }void -nfssvc_setvers (unsigned int ctlbits,int minorvers41) +nfssvc_setvers (unsigned int ctlbits,int minorvers) {int fd, n, off;char *ptr;@@ -280,9 +280,12 @@ nfssvc_setvers(unsigned int ctlbits, int minorvers41)if (fd <0 )return ; -if (minorvers41) - off +=snprintf (ptr+off,sizeof (buf) - off,"%c4.1" , - minorvers41 >0 ?'+' :'-' ); +for (n =NFS4_MINMINOR ; n <=NFS4_MAXMINOR ; n++) { +if (NFSCTL_VERISSET (minorvers, n)) + off +=snprintf (ptr+off,sizeof (buf) - off,"+4.%d " , n); +else + off +=snprintf (ptr+off,sizeof (buf) - off,"-4.%d " , n); + }for (n =NFSD_MINVERS ; n <=NFSD_MAXVERS ; n++) {if (NFSCTL_VERISSET (ctlbits, n)) off +=snprintf (ptr+off,sizeof (buf) - off,"+%d " , n);
Quoted 4 lines · Steve Dickson
Changed the default protocol versions that rpc.nfsd register with rpcbind to just 3 and 4. Version 2 can still be enabled with the '-V' flag, but it will not be on by default.
OK, I think that's a first reasonable step--ACK.
--b.
Quoted 39 lines
Signed-off-by Steve Dickson <[email protected]>--- support/include/nfs/nfs.h | 1 + utils/nfsd/nfsd.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)support/include/nfs/nfs.h +1
-0@@ -52,6 +52,7 @@ struct nfs_fh_old {#define NFSCTL_UDPISSET (_cltbits) ((_cltbits) & NFSCTL_UDPBIT)#define NFSCTL_TCPISSET (_cltbits) ((_cltbits) & NFSCTL_TCPBIT) +#define NFSCTL_VERDEFAULT (0xc)/* versions 3 and 4 */ #define NFSCTL_VERSET (_cltbits, _v) ((_cltbits) |= (1 << ((_v) - 1)))#define NFSCTL_UDPSET (_cltbits) ((_cltbits) |= NFSCTL_UDPBIT)#define NFSCTL_TCPSET (_cltbits) ((_cltbits) |= NFSCTL_TCPBIT)utils/nfsd/nfsd.c +1
-1@@ -100,7 +100,7 @@ main(int argc, char **argv)char *haddr =NULL ;int socket_up =0 ;int minorvers41 =0 ;/* nfsv4 minor version */ -unsigned int versbits =NFSCTL_ALLBITS ; +unsigned int versbits =NFSCTL_VERDEFAULT ;unsigned int protobits =NFSCTL_ALLBITS ;unsigned int proto4 =0 ;unsigned int proto6 =0 ;Signature · 6 lines
1.8.1.4 -- 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