浏览代码

NLM: Add helper to handle IPv4 addresses

Clean up: introduce a helper function to generate IPv4 addresses using
the same style as the IPv6 helper function we just added.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Chuck Lever 16 年之前
父节点
当前提交
afb03699dc
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8 3
      fs/lockd/host.c

+ 8 - 3
fs/lockd/host.c

@@ -105,6 +105,13 @@ static void nlm_clear_port(struct sockaddr *sap)
 	}
 	}
 }
 }
 
 
+static void nlm_display_ipv4_address(const struct sockaddr *sap, char *buf,
+				     const size_t len)
+{
+	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
+	snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
+}
+
 static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
 static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
 				     const size_t len)
 				     const size_t len)
 {
 {
@@ -122,11 +129,9 @@ static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
 static void nlm_display_address(const struct sockaddr *sap,
 static void nlm_display_address(const struct sockaddr *sap,
 				char *buf, const size_t len)
 				char *buf, const size_t len)
 {
 {
-	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
-
 	switch (sap->sa_family) {
 	switch (sap->sa_family) {
 	case AF_INET:
 	case AF_INET:
-		snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
+		nlm_display_ipv4_address(sap, buf, len);
 		break;
 		break;
 	case AF_INET6:
 	case AF_INET6:
 		nlm_display_ipv6_address(sap, buf, len);
 		nlm_display_ipv6_address(sap, buf, len);