From bf5c78cc241a1455462f9f5e1e40b6c820d23bbd Mon Sep 17 00:00:00 2001 From: Kinglong Mee Date: Wed, 6 May 2015 15:21:50 -0400 Subject: When mounting nfs with -ov4, -overs=4 or -onfsvers=4, fail as, mount -t nfs -ov4 192.168.31.12:/ /testidr/ mount.nfs: access denied by server while mounting 192.168.31.12:/ Fixes: f980298853 "mount.nfs: configurable minor version defaults" Reviewed-by: Benjamin Coddington Signed-off-by: Kinglong Mee Signed-off-by: Steve Dickson --- utils/mount/stropts.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index df67fac..2ae532e 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -108,12 +108,6 @@ static void nfs_default_version(struct nfsmount_info *mi) return; } - if (mi->version.v_mode == V_GENERAL && - config_default_vers.v_mode == V_DEFAULT) { - mi->version.v_mode = V_SPECIFIC; - return; - } - if (mi->version.v_mode == V_DEFAULT && config_default_vers.v_mode != V_DEFAULT) { mi->version.major = config_default_vers.major; @@ -121,9 +115,9 @@ static void nfs_default_version(struct nfsmount_info *mi) return; } - if (mi->version.v_mode == V_GENERAL && - config_default_vers.v_mode != V_DEFAULT) { - if (mi->version.major == config_default_vers.major) + if (mi->version.v_mode == V_GENERAL) { + if (config_default_vers.v_mode != V_DEFAULT && + mi->version.major == config_default_vers.major) mi->version.minor = config_default_vers.minor; return; } -- cgit