2 files changed, 5 insertions, 7 deletions

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index f015e0d62add..d9ef602fbc5a 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -331,7 +331,7 @@ static int __init root_nfs_addr(void)
         }
 
         snprintf(nfs_data.hostname, sizeof(nfs_data.hostname),
-                 "%u.%u.%u.%u", NIPQUAD(servaddr));
+                 "%pI4", &servaddr);
         return 0;
 }
 
@@ -423,8 +423,8 @@ static int __init root_nfs_getport(int program, int version, int proto)
 {
         struct sockaddr_in sin;
 
-        printk(KERN_NOTICE "Looking up port of RPC %d/%d on %u.%u.%u.%u\n",
-                program, version, NIPQUAD(servaddr));
+        printk(KERN_NOTICE "Looking up port of RPC %d/%d on %pI4\n",
+                program, version, &servaddr);
         set_sockaddr(&sin, servaddr, 0);
         return rpcb_getport_sync(&sin, program, version, proto);
 }
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index bd4c3dd550df..d6686f4786dc 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -465,14 +465,12 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
         switch (sap->sa_family) {
         case AF_INET: {
                 struct sockaddr_in *sin = (struct sockaddr_in *)sap;
-                seq_printf(m, ",mountaddr=" NIPQUAD_FMT,
-                                NIPQUAD(sin->sin_addr.s_addr));
+                seq_printf(m, ",mountaddr=%pI4", &sin->sin_addr.s_addr);
                 break;
         }
         case AF_INET6: {
                 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
-                seq_printf(m, ",mountaddr=" NIP6_FMT,
-                                NIP6(sin6->sin6_addr));
+                seq_printf(m, ",mountaddr=%pI6", &sin6->sin6_addr);
                 break;
         }
         default: