From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:58446 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752897AbdFSPZd (ORCPT ); Mon, 19 Jun 2017 11:25:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 672AB80C19 for ; Mon, 19 Jun 2017 15:25:28 +0000 (UTC) Received: from steved.boston.devel.redhat.com (ovpn-116-126.phx2.redhat.com [10.3.116.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2122F8274D for ; Mon, 19 Jun 2017 15:25:28 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 1/2 V3] mount.nfs: Use default minor version when -t nfs4 is specified Date: Mon, 19 Jun 2017 11:25:25 -0400 Message-Id: <20170619152526.26260-1-steved@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: When the nfs4 filesystem specified, the default major and minor versions should be used. v2: Added the NFS_DEFAULT_MAJOR/MINOR defines v3: Add back the setting of v_mode to V_GENERAL in nfs_set_version() Signed-off-by: Steve Dickson --- utils/mount/stropts.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index c0266e5..fbea6fb 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -73,6 +73,13 @@ #define NFS_DEF_BG_TIMEOUT_MINUTES (10000u) #endif +#ifndef NFS_DEFAULT_MAJOR +#define NFS_DEFAULT_MAJOR 4 +#endif +#ifndef NFS_DEFAULT_MINOR +#define NFS_DEFAULT_MINOR 2 +#endif + extern int nfs_mount_data_version; extern char *progname; extern int verbose; @@ -124,8 +131,8 @@ static void nfs_default_version(struct nfsmount_info *mi) } #endif /* MOUNT_CONFIG */ - mi->version.major = 4; - mi->version.minor = 2; + mi->version.major = NFS_DEFAULT_MAJOR; + mi->version.minor = NFS_DEFAULT_MINOR; } /* @@ -316,7 +323,9 @@ static int nfs_set_version(struct nfsmount_info *mi) return 0; if (strncmp(mi->type, "nfs4", 4) == 0) { - mi->version.major = 4; + /* Set to default values */ + mi->version.major = NFS_DEFAULT_MAJOR; + mi->version.minor = NFS_DEFAULT_MINOR; mi->version.v_mode = V_GENERAL; } /* -- 2.9.4