From: "J. Bruce Fields" <bfields@xxxxxxxxxx>
There are races when switching use_ipaddr on or off: it's possible the
kernel may still do export upcalls with the previous client type. So,
let's just match either one.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
---
utils/mountd/cache.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index a6bad07..181922b 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -495,12 +495,13 @@ static bool match_fsid(struct parsed_fsid *parsed, nfs_export *exp, char *path)
return false;
}
-static bool match_client(char *dom, nfs_export *exp, struct addinfo *ai)
+static bool match_client(char *dom, nfs_export *exp, struct addrinfo *ai)
{
- if (!use_ipaddr && client_member(dom, exp->m_client->m_hostname))
+ if (client_member(dom, exp->m_client->m_hostname))
return true;
- if (use_ipaddr && ai && client_check(exp->m_client, ai))
+ if (ai && client_check(exp->m_client, ai))
return true;
+ return false;
}
struct addrinfo *lookup_client_addr(char *dom)
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
