2 files changed, 4 insertions, 4 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index c8ab7d70390d..c48c26380771 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -115,12 +115,12 @@ 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,
-                                 NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
+                        snprintf(buf, len, "%pI4",
+                                 &sin6->sin6_addr.s6_addr32[3]);
                 else
                         snprintf(buf, len, "%pI6", &sin6->sin6_addr);
                 break;
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 4e7e958e8f67..ffd3461f75ef 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -179,7 +179,7 @@ static __be32 *xdr_encode_mon_name(__be32 *p, struct nsm_args *argp)
 
         if (!nsm_use_hostnames) {
                 snprintf(buffer, XDR_ADDRBUF_LEN,
-                         NIPQUAD_FMT, NIPQUAD(argp->addr));
+                         "%pI4", &argp->addr);
                 name = buffer;
         }