Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:45648 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751232AbeDQSmW (ORCPT ); Tue, 17 Apr 2018 14:42:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DADD316253C for ; Tue, 17 Apr 2018 18:42:22 +0000 (UTC) Received: from steved.boston.devel.redhat.com (ovpn-116-57.phx2.redhat.com [10.3.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE5E19062 for ; Tue, 17 Apr 2018 18:42:21 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH] nfsd: Set default minor versions Date: Tue, 17 Apr 2018 14:42:20 -0400 Message-Id: <20180417184220.54724-1-steved@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: 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. Signed-off-by: Steve Dickson --- support/include/nfs/nfs.h | 1 + utils/nfsd/nfsd.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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; -- 2.14.3