1 diff --git a/CHANGELOG b/CHANGELOG
2 index be50aad..3557b16 100644
6 - update negative mount timeout handling.
7 - fix large group handling (Ryan Thomas).
8 - fix for dynamic logging breaking non-sasl build (Guillaume Rousse)
9 +- eliminate NULL proc ping for singleton host or local mounts.
11 18/06/2007 autofs-5.0.2
12 -----------------------
13 diff --git a/modules/replicated.c b/modules/replicated.c
14 index 14b20a9..90b2925 100644
15 --- a/modules/replicated.c
16 +++ b/modules/replicated.c
17 @@ -725,19 +725,21 @@ int prune_host_list(unsigned logopt, struct host **list,
18 while (this && this->proximity == PROXIMITY_LOCAL)
21 - proximity = PROXIMITY_LOCAL;
23 - proximity = this->proximity;
25 + * Check for either a list containing only proximity local hosts
26 + * or a single host entry whose proximity isn't local. If so
27 + * return immediately as we don't want to add probe latency for
28 + * the common case of a single filesystem mount request.
30 + if (!this || !this->next)
33 + proximity = this->proximity;
37 struct host *next = this->next;
39 - if (this->proximity == PROXIMITY_LOCAL) {
44 if (this->proximity != proximity)
47 @@ -758,10 +760,6 @@ int prune_host_list(unsigned logopt, struct host **list,
51 - /* If there are only local entries on the list, just return it. */
55 /* Select NFS version of highest number of closest servers */
57 v4_tcp_count = v3_tcp_count = v2_tcp_count = 0;