You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.5 KiB
46 lines
1.5 KiB
diff -up nfs-utils-1.3.0/utils/mount/stropts.c.orig nfs-utils-1.3.0/utils/mount/stropts.c |
|
--- nfs-utils-1.3.0/utils/mount/stropts.c.orig 2017-06-01 11:24:19.925018714 -0400 |
|
+++ nfs-utils-1.3.0/utils/mount/stropts.c 2017-06-01 11:25:20.033023121 -0400 |
|
@@ -313,9 +313,10 @@ static int nfs_set_version(struct nfsmou |
|
if (!nfs_nfs_version(mi->options, &mi->version)) |
|
return 0; |
|
|
|
- if (strncmp(mi->type, "nfs4", 4) == 0) |
|
+ if (strncmp(mi->type, "nfs4", 4) == 0) { |
|
mi->version.major = 4; |
|
- |
|
+ mi->version.v_mode = V_GENERAL; |
|
+ } |
|
/* |
|
* Before 2.6.32, the kernel NFS client didn't |
|
* support "-t nfs vers=4" mounts, so NFS version |
|
@@ -856,9 +857,6 @@ check_result: |
|
case EINVAL: |
|
/* A less clear indication that our client |
|
* does not support NFSv4 minor version. */ |
|
- if (mi->version.v_mode == V_GENERAL && |
|
- mi->version.minor == 0) |
|
- return result; |
|
if (mi->version.v_mode != V_SPECIFIC) { |
|
if (mi->version.minor > 0) { |
|
mi->version.minor--; |
|
@@ -880,6 +878,9 @@ check_result: |
|
/* UDP-Only servers won't support v4, but maybe it |
|
* just isn't ready yet. So try v3, but double-check |
|
* with rpcbind for v4. */ |
|
+ if (mi->version.v_mode == V_GENERAL) |
|
+ /* Mustn't try v2,v3 */ |
|
+ return result; |
|
result = nfs_try_mount_v3v2(mi, TRUE); |
|
if (result == 0 && errno == EAGAIN) { |
|
/* v4 server seems to be registered now. */ |
|
@@ -893,6 +894,9 @@ check_result: |
|
} |
|
|
|
fall_back: |
|
+ if (mi->version.v_mode == V_GENERAL) |
|
+ /* v2,3 fallback not allowed */ |
|
+ return result; |
|
return nfs_try_mount_v3v2(mi, FALSE); |
|
} |
|
|
|
|