Simply use nfs_compare_sockaddr in place of addrs_match
Signed-off-by: NeilBrown <neilb@xxxxxxx>
---
support/export/client.c | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/support/export/client.c b/support/export/client.c
index dc01067..286dcd6 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -372,27 +372,6 @@ add_name(char *old, const char *add)
return new;
}
-static _Bool
-addrs_match4(const struct sockaddr *sa1, const struct sockaddr *sa2)
-{
- const struct sockaddr_in *si1 = (const struct sockaddr_in *)sa1;
- const struct sockaddr_in *si2 = (const struct sockaddr_in *)sa2;
-
- return si1->sin_addr.s_addr == si2->sin_addr.s_addr;
-}
-
-static _Bool
-addrs_match(const struct sockaddr *sa1, const struct sockaddr *sa2)
-{
- if (sa1->sa_family == sa2->sa_family)
- switch (sa1->sa_family) {
- case AF_INET:
- return addrs_match4(sa1, sa2);
- }
-
- return false;
-}
-
/*
* Check each address listed in @ai against each address
* stored in @clp. Return 1 if a match is found, otherwise
@@ -405,7 +384,7 @@ check_fqdn(const nfs_client *clp, const struct addrinfo *ai)
for (; ai; ai = ai->ai_next)
for (i = 0; i < clp->m_naddr; i++)
- if (addrs_match(ai->ai_addr, get_addrlist(clp, i)))
+ if (nfs_compare_sockaddr(ai->ai_addr, get_addrlist(clp, i)))
return 1;
return 0;
--
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
