diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-16 13:15:46 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@dickson.boston.devel.redhat.com> | 2008-07-16 13:15:46 -0400 |
| commit | 8508942e7244017325690e2d0c17429fa0cb9873 (patch) | |
| tree | b8731eafc4cffb5661022f456888c0a3aabfa5e5 /utils/mount/network.c | |
| parent | 8e158aa65577b96494eaa94c4983eed1449116dc (diff) | |
If an NFS server is only listening on TCP for portmap (as apparently
MS-Windows-Server2003R2SP2 does), mount doesn't cope. There is retry
logic in case the initial choice of version/etc doesn't work, but it
doesn't cope with mountd needing tcp.
So:
Fix probe_port so that a TIMEDOUT error doesn't simply abort
but probes with other protocols (e.g. tcp).
Fix rewrite_mount_options to extract the mountproto option before
doing a probe, then set mountproto (and mount prot) based
on the result.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/mount/network.c')
| -rw-r--r-- | utils/mount/network.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/mount/network.c b/utils/mount/network.c index 7d3d09a..75354a7 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -532,11 +532,10 @@ static int probe_port(clnt_addr_t *server, const unsigned long *versions, } if (clnt_ping(saddr, prog, *p_vers, *p_prot, NULL)) goto out_ok; - if (rpc_createerr.cf_stat == RPC_TIMEDOUT) - goto out_bad; } } if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED && + rpc_createerr.cf_stat != RPC_TIMEDOUT && rpc_createerr.cf_stat != RPC_PROGVERSMISMATCH) goto out_bad; @@ -545,6 +544,9 @@ static int probe_port(clnt_addr_t *server, const unsigned long *versions, continue; p_prot = protos; } + if (rpc_createerr.cf_stat == RPC_TIMEDOUT) + goto out_bad; + if (vers || !*++p_vers) break; } |