Blame autofs-5.0.3-check-replicated-list-after-probe.patch
|
Ian Kent |
62ad96 |
autofs-5.0.3 - check replicated list after probe
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
From: Ian Kent <raven@themaw.net>
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
When checking a list of servers for proximity and NFS version
|
|
Ian Kent |
62ad96 |
the list may become empty after after the initial probe. This
|
|
Ian Kent |
62ad96 |
case isn't handled and this patch adds it.
|
|
Ian Kent |
62ad96 |
---
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
modules/replicated.c | 9 +++++++++
|
|
Ian Kent |
62ad96 |
1 files changed, 9 insertions(+), 0 deletions(-)
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
diff --git a/modules/replicated.c b/modules/replicated.c
|
|
Ian Kent |
62ad96 |
index 925f641..271907c 100644
|
|
Ian Kent |
62ad96 |
--- a/modules/replicated.c
|
|
Ian Kent |
62ad96 |
+++ b/modules/replicated.c
|
|
Ian Kent |
62ad96 |
@@ -768,6 +768,15 @@ int prune_host_list(unsigned logopt, struct host **list,
|
|
Ian Kent |
62ad96 |
this = next;
|
|
Ian Kent |
62ad96 |
}
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
+ /*
|
|
Ian Kent |
62ad96 |
+ * The list of hosts that aren't proximity local may now
|
|
Ian Kent |
62ad96 |
+ * be empty if we haven't been able probe any so we need
|
|
Ian Kent |
62ad96 |
+ * to check again for a list containing only proximity
|
|
Ian Kent |
62ad96 |
+ * local hosts.
|
|
Ian Kent |
62ad96 |
+ */
|
|
Ian Kent |
62ad96 |
+ if (!first)
|
|
Ian Kent |
62ad96 |
+ return 1;
|
|
Ian Kent |
62ad96 |
+
|
|
Ian Kent |
62ad96 |
last = this;
|
|
Ian Kent |
62ad96 |
|
|
Ian Kent |
62ad96 |
/* Select NFS version of highest number of closest servers */
|