aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@netapp.com>2015-07-13 14:01:26 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-08-17 14:29:36 -0400
commit7b0ce60c0b203a2a037f308e387152acbf99c445 (patch)
tree11168fd0a6fba8304f2c06c1c8210658ed61112f
parentc7e9668e78eab69b7ade9897bea1fbd77dd18775 (diff)
SUNRPC: Drop double-underscores from rpc_cmp_addr{4|6}()
I'm planning on using these functions inside the client, so remove the underscores to make it feel like I'm using a public interface. Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--include/linux/sunrpc/addr.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
index 07d8e53bedfc..772faefc15aa 100644
--- a/include/linux/sunrpc/addr.h
+++ b/include/linux/sunrpc/addr.h
@@ -46,8 +46,8 @@ static inline void rpc_set_port(struct sockaddr *sap,
46#define IPV6_SCOPE_DELIMITER '%' 46#define IPV6_SCOPE_DELIMITER '%'
47#define IPV6_SCOPE_ID_LEN sizeof("%nnnnnnnnnn") 47#define IPV6_SCOPE_ID_LEN sizeof("%nnnnnnnnnn")
48 48
49static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1, 49static inline bool rpc_cmp_addr4(const struct sockaddr *sap1,
50 const struct sockaddr *sap2) 50 const struct sockaddr *sap2)
51{ 51{
52 const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1; 52 const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
53 const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2; 53 const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
@@ -67,8 +67,8 @@ static inline bool __rpc_copy_addr4(struct sockaddr *dst,
67} 67}
68 68
69#if IS_ENABLED(CONFIG_IPV6) 69#if IS_ENABLED(CONFIG_IPV6)
70static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1, 70static inline bool rpc_cmp_addr6(const struct sockaddr *sap1,
71 const struct sockaddr *sap2) 71 const struct sockaddr *sap2)
72{ 72{
73 const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1; 73 const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
74 const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2; 74 const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
@@ -122,9 +122,9 @@ static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
122 if (sap1->sa_family == sap2->sa_family) { 122 if (sap1->sa_family == sap2->sa_family) {
123 switch (sap1->sa_family) { 123 switch (sap1->sa_family) {
124 case AF_INET: 124 case AF_INET:
125 return __rpc_cmp_addr4(sap1, sap2); 125 return rpc_cmp_addr4(sap1, sap2);
126 case AF_INET6: 126 case AF_INET6:
127 return __rpc_cmp_addr6(sap1, sap2); 127 return rpc_cmp_addr6(sap1, sap2);
128 } 128 }
129 } 129 }
130 return false; 130 return false;