1 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index acc2aa5021d1..abdebf76b820 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -116,14 +116,14 @@ static void nlm_display_address(const struct sockaddr *sap,
                snprintf(buf, len, "unspecified");
                break;
        case AF_INET:
-                snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));
+                snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
                break;
        case AF_INET6:
                if (ipv6_addr_v4mapped(&sin6->sin6_addr))
-                        snprintf(buf, len, NIPQUAD_FMT,
+                        snprintf(buf, len, "%pI4",
-                                 NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
+                                 &sin6->sin6_addr.s6_addr32[3]);
                else
-                        snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));
+                        snprintf(buf, len, "%pI6", &sin6->sin6_addr);
                break;
        default:
                snprintf(buf, len, "unsupported address family");

diff --git a/fs/lockd/host.c b/fs/lockd/host.c index acc2aa5021d1..abdebf76b820 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c
@@ -116,14 +116,14 @@ static void nlm_display_address(const struct sockaddr *sap,
116	snprintf(buf, len, "unspecified");	116	snprintf(buf, len, "unspecified");
117	break;	117	break;
118	case AF_INET:	118	case AF_INET:
119	snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));	119	snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
120	break;	120	break;
121	case AF_INET6:	121	case AF_INET6:
122	if (ipv6_addr_v4mapped(&sin6->sin6_addr))	122	if (ipv6_addr_v4mapped(&sin6->sin6_addr))
123	snprintf(buf, len, NIPQUAD_FMT,	123	snprintf(buf, len, "%pI4",
124	NIPQUAD(sin6->sin6_addr.s6_addr32[3]));	124	&sin6->sin6_addr.s6_addr32[3]);
125	else	125	else
126	snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));	126	snprintf(buf, len, "%pI6", &sin6->sin6_addr);
127	break;	127	break;
128	default:	128	default:
129	snprintf(buf, len, "unsupported address family");	129	snprintf(buf, len, "unsupported address family");