summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2015-05-06 15:21:50 -0400
committerSteve Dickson <steved@redhat.com>2015-05-06 15:21:50 -0400
commitbf5c78cc241a1455462f9f5e1e40b6c820d23bbd (patch)
treeeda768fb3b2590f80d54fdc88a141a2030d2e4a3
parent3e28fe73af023bf42e0d654146bfb9314b4d8438 (diff)
downloadnfs-utils-bf5c78cc241a1455462f9f5e1e40b6c820d23bbd.tar.gz
nfs-utils-bf5c78cc241a1455462f9f5e1e40b6c820d23bbd.tar.xz
nfs-utils-bf5c78cc241a1455462f9f5e1e40b6c820d23bbd.zip
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 <bcodding@redhat.com> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/mount/stropts.c12
1 files 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;
}