commit 1a372a7b656ddf2be21ddad70b6c64c9d1d9d161 Author: Steve Dickson Date: Tue Apr 17 14:26:44 2018 -0400 nfsd: Set default minor versions Due to the way the kernel stores the supported minor versions, when a minor is turned off, via the -N flag, it can only turned back on via -V flag. The default minor values should also enable these minor versions. Acked-by: J. Bruce Fields Signed-off-by: Steve Dickson diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h index 7933ff5..b7d9e06 100644 --- a/support/include/nfs/nfs.h +++ b/support/include/nfs/nfs.h @@ -40,6 +40,7 @@ struct nfs_fh_len { #define NFSCTL_TCPISSET(_cltbits) ((_cltbits) & NFSCTL_TCPBIT) #define NFSCTL_VERDEFAULT (0xc) /* versions 3 and 4 */ +#define NFSCTL_MINDEFAULT (0x7) /* minor versions 4.1 and 4.2 */ #define NFSCTL_VERSET(_cltbits, _v) ((_cltbits) |= (1 << ((_v) - 1))) #define NFSCTL_MINORSET(_cltbits, _v) ((_cltbits) |= (1 << (_v))) #define NFSCTL_UDPSET(_cltbits) ((_cltbits) |= NFSCTL_UDPBIT) diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index f41a2de..2303a5d 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -65,8 +65,8 @@ main(int argc, char **argv) int hcounter = 0; struct conf_list *hosts; int socket_up = 0; - unsigned int minorvers = 0; - unsigned int minorversset = 0; + unsigned int minorvers = NFSCTL_MINDEFAULT; + unsigned int minorversset = NFSCTL_MINDEFAULT; unsigned int minormask = 0; unsigned int versbits = NFSCTL_VERDEFAULT; unsigned int protobits = NFSCTL_PROTODEFAULT;