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>

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 012e49aaecd130ddb7b10f384523290af0bf6a24..780918acd6f40ca812478d8c20e5eb45817b72a7 100644 (file)
--- a/fs/lockd/host.c
+++ b/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,
                                     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,
                                char *buf, const size_t len)
 {
-       const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
-
        switch (sap->sa_family) {
        case AF_INET:
-               snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
+               nlm_display_ipv4_address(sap, buf, len);
                break;
        case AF_INET6:
                nlm_display_ipv6_address(sap, buf, len);