2 files changed, 4 insertions, 6 deletions

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index fcee9298b620..359144c510b9 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -121,11 +121,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
 
         /* add the server address */
         if (server->addr.sockAddr.sin_family == AF_INET)
-                sprintf(dp, "ip4=" NIPQUAD_FMT,
-                        NIPQUAD(server->addr.sockAddr.sin_addr));
+                sprintf(dp, "ip4=%pI4", &server->addr.sockAddr.sin_addr);
         else if (server->addr.sockAddr.sin_family == AF_INET6)
-                sprintf(dp, "ip6=" NIP6_SEQFMT,
-                        NIP6(server->addr.sockAddr6.sin6_addr));
+                sprintf(dp, "ip6=%pi6", &server->addr.sockAddr6.sin6_addr);
         else
                 goto out;
 
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index e9f9248cb3fe..2df8e6d0fb08 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2082,8 +2082,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
                         rc = -ENOMEM;
                 else {
                         pSesInfo->server = srvTcp;
-                        sprintf(pSesInfo->serverName, "%u.%u.%u.%u",
-                                NIPQUAD(sin_server.sin_addr.s_addr));
+                        sprintf(pSesInfo->serverName, "%pI4",
+                                &sin_server.sin_addr.s_addr);
                 }
 
                 if (!rc) {