Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757407Ab3HBHP2 (ORCPT ); Fri, 2 Aug 2013 03:15:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52535 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756568Ab3HBHPX (ORCPT ); Fri, 2 Aug 2013 03:15:23 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: "David S. Miller" , Steve French , Christine Caulfield , David Teigland , Trond Myklebust , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, Cong Wang Subject: [Patch net-next v2 6/8] fs: use generic union inet_addr and helper functions Date: Fri, 2 Aug 2013 15:14:32 +0800 Message-Id: <1375427674-21735-7-git-send-email-amwang@redhat.com> In-Reply-To: <1375427674-21735-1-git-send-email-amwang@redhat.com> References: <1375427674-21735-1-git-send-email-amwang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 13181 Lines: 431 From: Cong Wang nfs and cifs define some helper functions for sockaddr, they can use the generic functions for union inet_addr too. Since some dlm code needs to compare ->sin_port, introduce a generic function inet_addr_equal_strict() for it. Cc: Steve French Cc: Christine Caulfield Cc: David Teigland Cc: Trond Myklebust Cc: linux-cifs@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: cluster-devel@redhat.com Cc: linux-nfs@vger.kernel.org Signed-off-by: Cong Wang --- fs/cifs/connect.c | 39 ++++-------------- fs/dlm/lowcomms.c | 24 ++--------- fs/nfs/client.c | 94 ++----------------------------------------- fs/nfs/nfs4filelayoutdev.c | 37 ++--------------- fs/nfs/super.c | 31 +------------- include/net/inet_addr.h | 1 + net/core/utils.c | 23 +++++++++++ 7 files changed, 50 insertions(+), 199 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index fa68813..f5c310e 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include "cifspdu.h" @@ -1899,17 +1900,10 @@ srcip_matches(struct sockaddr *srcaddr, struct sockaddr *rhs) { switch (srcaddr->sa_family) { case AF_UNSPEC: - return (rhs->sa_family == AF_UNSPEC); - case AF_INET: { - struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; - struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs; - return (saddr4->sin_addr.s_addr == vaddr4->sin_addr.s_addr); - } - case AF_INET6: { - struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; - struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs; - return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr); - } + case AF_INET: + case AF_INET6: + return inet_addr_equal((union inet_addr *)srcaddr, + (union inet_addr *)rhs); default: WARN_ON(1); return false; /* don't expect to be here */ @@ -1956,27 +1950,12 @@ match_address(struct TCP_Server_Info *server, struct sockaddr *addr, struct sockaddr *srcaddr) { switch (addr->sa_family) { - case AF_INET: { - struct sockaddr_in *addr4 = (struct sockaddr_in *)addr; - struct sockaddr_in *srv_addr4 = - (struct sockaddr_in *)&server->dstaddr; - - if (addr4->sin_addr.s_addr != srv_addr4->sin_addr.s_addr) - return false; - break; - } - case AF_INET6: { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr; - struct sockaddr_in6 *srv_addr6 = - (struct sockaddr_in6 *)&server->dstaddr; - - if (!ipv6_addr_equal(&addr6->sin6_addr, - &srv_addr6->sin6_addr)) - return false; - if (addr6->sin6_scope_id != srv_addr6->sin6_scope_id) + case AF_INET: + case AF_INET6: + if (!inet_addr_equal((union inet_addr *)addr, + (union inet_addr *)&server->dstaddr)) return false; break; - } default: WARN_ON(1); return false; /* don't expect to be here */ diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index d90909e..c051237 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -54,6 +54,7 @@ #include #include #include +#include #include "dlm_internal.h" #include "lowcomms.h" @@ -286,28 +287,13 @@ static struct dlm_node_addr *find_node_addr(int nodeid) static int addr_compare(struct sockaddr_storage *x, struct sockaddr_storage *y) { switch (x->ss_family) { - case AF_INET: { - struct sockaddr_in *sinx = (struct sockaddr_in *)x; - struct sockaddr_in *siny = (struct sockaddr_in *)y; - if (sinx->sin_addr.s_addr != siny->sin_addr.s_addr) - return 0; - if (sinx->sin_port != siny->sin_port) - return 0; - break; - } - case AF_INET6: { - struct sockaddr_in6 *sinx = (struct sockaddr_in6 *)x; - struct sockaddr_in6 *siny = (struct sockaddr_in6 *)y; - if (!ipv6_addr_equal(&sinx->sin6_addr, &siny->sin6_addr)) - return 0; - if (sinx->sin6_port != siny->sin6_port) - return 0; - break; - } + case AF_INET: + case AF_INET6: + return inet_addr_equal_strict((union inet_addr *)x, + (union inet_addr *)y); default: return 0; } - return 1; } static int nodeid_to_addr(int nodeid, struct sockaddr_storage *sas_out, diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 340b1ef..a050be6 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -283,75 +284,6 @@ void nfs_put_client(struct nfs_client *clp) } EXPORT_SYMBOL_GPL(nfs_put_client); -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) -/* - * Test if two ip6 socket addresses refer to the same socket by - * comparing relevant fields. The padding bytes specifically, are not - * compared. sin6_flowinfo is not compared because it only affects QoS - * and sin6_scope_id is only compared if the address is "link local" - * because "link local" addresses need only be unique to a specific - * link. Conversely, ordinary unicast addresses might have different - * sin6_scope_id. - * - * The caller should ensure both socket addresses are AF_INET6. - */ -static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1, - const struct sockaddr *sa2) -{ - const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sa1; - const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sa2; - - if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr)) - return 0; - else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL) - return sin1->sin6_scope_id == sin2->sin6_scope_id; - - return 1; -} -#else /* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */ -static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1, - const struct sockaddr *sa2) -{ - return 0; -} -#endif - -/* - * Test if two ip4 socket addresses refer to the same socket, by - * comparing relevant fields. The padding bytes specifically, are - * not compared. - * - * The caller should ensure both socket addresses are AF_INET. - */ -static int nfs_sockaddr_match_ipaddr4(const struct sockaddr *sa1, - const struct sockaddr *sa2) -{ - const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sa1; - const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sa2; - - return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr; -} - -static int nfs_sockaddr_cmp_ip6(const struct sockaddr *sa1, - const struct sockaddr *sa2) -{ - const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sa1; - const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sa2; - - return nfs_sockaddr_match_ipaddr6(sa1, sa2) && - (sin1->sin6_port == sin2->sin6_port); -} - -static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1, - const struct sockaddr *sa2) -{ - const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sa1; - const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sa2; - - return nfs_sockaddr_match_ipaddr4(sa1, sa2) && - (sin1->sin_port == sin2->sin_port); -} - #if defined(CONFIG_NFS_V4_1) /* * Test if two socket addresses represent the same actual socket, @@ -360,16 +292,8 @@ static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1, int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1, const struct sockaddr *sa2) { - if (sa1->sa_family != sa2->sa_family) - return 0; - - switch (sa1->sa_family) { - case AF_INET: - return nfs_sockaddr_match_ipaddr4(sa1, sa2); - case AF_INET6: - return nfs_sockaddr_match_ipaddr6(sa1, sa2); - } - return 0; + return inet_addr_equal((const union inet_addr *)sa1, + (const union inet_addr *)sa2); } EXPORT_SYMBOL_GPL(nfs_sockaddr_match_ipaddr); #endif /* CONFIG_NFS_V4_1 */ @@ -381,16 +305,8 @@ EXPORT_SYMBOL_GPL(nfs_sockaddr_match_ipaddr); static int nfs_sockaddr_cmp(const struct sockaddr *sa1, const struct sockaddr *sa2) { - if (sa1->sa_family != sa2->sa_family) - return 0; - - switch (sa1->sa_family) { - case AF_INET: - return nfs_sockaddr_cmp_ip4(sa1, sa2); - case AF_INET6: - return nfs_sockaddr_cmp_ip6(sa1, sa2); - } - return 0; + return inet_addr_equal_strict((union inet_addr *)sa1, + (union inet_addr *)sa2); } /* diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index 95604f6..955494cb 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "internal.h" #include "nfs4session.h" @@ -74,44 +75,14 @@ print_ds(struct nfs4_pnfs_ds *ds) static bool same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) { - struct sockaddr_in *a, *b; - struct sockaddr_in6 *a6, *b6; - - if (addr1->sa_family != addr2->sa_family) - return false; - - switch (addr1->sa_family) { - case AF_INET: - a = (struct sockaddr_in *)addr1; - b = (struct sockaddr_in *)addr2; - - if (a->sin_addr.s_addr == b->sin_addr.s_addr && - a->sin_port == b->sin_port) - return true; - break; - - case AF_INET6: - a6 = (struct sockaddr_in6 *)addr1; - b6 = (struct sockaddr_in6 *)addr2; - - /* LINKLOCAL addresses must have matching scope_id */ - if (ipv6_addr_scope(&a6->sin6_addr) == - IPV6_ADDR_SCOPE_LINKLOCAL && - a6->sin6_scope_id != b6->sin6_scope_id) - return false; - - if (ipv6_addr_equal(&a6->sin6_addr, &b6->sin6_addr) && - a6->sin6_port == b6->sin6_port) - return true; - break; - - default: + if (addr1->sa_family != AF_INET && addr1->sa_family != AF_INET6) { dprintk("%s: unhandled address family: %u\n", __func__, addr1->sa_family); return false; } - return false; + return inet_addr_equal_strict((union inet_addr *)addr1, + (union inet_addr *)addr2); } static bool diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 71fdc0d..f7d5914 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -2335,34 +2336,8 @@ static int nfs_compare_super_address(struct nfs_server *server1, sap1 = (struct sockaddr *)&server1->nfs_client->cl_addr; sap2 = (struct sockaddr *)&server2->nfs_client->cl_addr; - - if (sap1->sa_family != sap2->sa_family) - return 0; - - switch (sap1->sa_family) { - case AF_INET: { - struct sockaddr_in *sin1 = (struct sockaddr_in *)sap1; - struct sockaddr_in *sin2 = (struct sockaddr_in *)sap2; - if (sin1->sin_addr.s_addr != sin2->sin_addr.s_addr) - return 0; - if (sin1->sin_port != sin2->sin_port) - return 0; - break; - } - case AF_INET6: { - struct sockaddr_in6 *sin1 = (struct sockaddr_in6 *)sap1; - struct sockaddr_in6 *sin2 = (struct sockaddr_in6 *)sap2; - if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr)) - return 0; - if (sin1->sin6_port != sin2->sin6_port) - return 0; - break; - } - default: - return 0; - } - - return 1; + return inet_addr_equal_strict((union inet_addr *)sap1, + (union inet_addr *)sap2); } static int nfs_compare_super(struct super_block *sb, void *data) diff --git a/include/net/inet_addr.h b/include/net/inet_addr.h index e846050..2fab98c 100644 --- a/include/net/inet_addr.h +++ b/include/net/inet_addr.h @@ -122,6 +122,7 @@ void inet_addr_set_port(union inet_addr *sap, } bool inet_addr_equal(const union inet_addr *a, const union inet_addr *b); +bool inet_addr_equal_strict(const union inet_addr *a, const union inet_addr *b); int simple_inet_pton(const char *str, union inet_addr *addr); #endif diff --git a/net/core/utils.c b/net/core/utils.c index 837bb18..489bc8d 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -380,6 +380,8 @@ bool inet_addr_equal(const union inet_addr *a, const union inet_addr *b) { if (a->sa.sa_family != b->sa.sa_family) return false; + if (a->sa.sa_family == AF_UNSPEC) + return true; else if (a->sa.sa_family == AF_INET6) { if (!ipv6_addr_equal(&a->sin6.sin6_addr, &b->sin6.sin6_addr)) return false; @@ -399,3 +401,24 @@ bool inet_addr_equal(const union inet_addr *a, const union inet_addr *b) } #endif EXPORT_SYMBOL(inet_addr_equal); + +/* + * Unlike inet_addr_equal(), this function compares ->sin_port too. + */ +bool inet_addr_equal_strict(const union inet_addr *a, const union inet_addr *b) +{ + if (inet_addr_equal(a, b)) { + switch (a->sa.sa_family) { +#if IS_ENABLED(CONFIG_IPV6) + case AF_INET6: + return a->sin6.sin6_port == b->sin6.sin6_port; +#endif + case AF_INET: + return a->sin.sin_port == b->sin.sin_port; + default: + return true; + } + } else + return false; +} +EXPORT_SYMBOL(inet_addr_equal_strict); -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/