summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2007-11-03 10:36:36 -0400
committerSteve Dickson <steved@redhat.com>2007-11-03 10:36:36 -0400
commit812a43c1e4e055ee684ab95b28b41f0c16cc52fd (patch)
treed10fd05ae865a1d1f1db5cf5833b1d5967e99f46
parentd4b159620b26dce8f83d41358d618ccc82fa82d4 (diff)
downloadnfs-utils-812a43c1e4e055ee684ab95b28b41f0c16cc52fd.tar.gz
nfs-utils-812a43c1e4e055ee684ab95b28b41f0c16cc52fd.tar.xz
nfs-utils-812a43c1e4e055ee684ab95b28b41f0c16cc52fd.zip
When following a list of mount versions to probe -
e.g. probe_mnt1_first or probe_mnt3_first - probe_both will first probe the appropriate NFS version and then, if that succeeds, probe the actual mount version. However instead of probing the target mount version, it probes the "most appropriate" mount version for the given NFS version. This results in it probing: NFSv2, MOUNTv1 twice rather than NFSv2, MOUNTv1 NFSv2, MOUNTv2 as would be more correct. This patch removes the "choose most correct" step and just use the current mouint version for the probe_vers array. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/mount/network.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/mount/network.c b/utils/mount/network.c
index 2b09457..38d0135 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -494,7 +494,7 @@ int probe_bothports(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server)
for (; *probe_vers; probe_vers++) {
nfs_pmap->pm_vers = mntvers_to_nfs(*probe_vers);
if ((res = probe_nfsport(nfs_server) != 0)) {
- mnt_pmap->pm_vers = nfsvers_to_mnt(nfs_pmap->pm_vers);
+ mnt_pmap->pm_vers = *probe_vers;
if ((res = probe_mntport(mnt_server)) != 0)
return 1;
memcpy(mnt_pmap, &save_mnt, sizeof(*mnt_pmap));