aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-31 03:56:28 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-31 03:56:28 -0400
commitbe859405487324ed548f1ba11dc949b8230ab991 (patch)
tree3893ac2ce3b212b100d9e1e1e3e2fc1fa0c3f47f /fs/cifs
parent63779436ab4ad0867bcea53bf853b0004d7b895d (diff)
fs: replace NIPQUAD()
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u can be replaced with %pI4 Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifs_spnego.c3
-rw-r--r--fs/cifs/connect.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index 0e186cd20ad9..359144c510b9 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -121,8 +121,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
121 121
122 /* add the server address */ 122 /* add the server address */
123 if (server->addr.sockAddr.sin_family == AF_INET) 123 if (server->addr.sockAddr.sin_family == AF_INET)
124 sprintf(dp, "ip4=" NIPQUAD_FMT, 124 sprintf(dp, "ip4=%pI4", &server->addr.sockAddr.sin_addr);
125 NIPQUAD(server->addr.sockAddr.sin_addr));
126 else if (server->addr.sockAddr.sin_family == AF_INET6) 125 else if (server->addr.sockAddr.sin_family == AF_INET6)
127 sprintf(dp, "ip6=%pi6", &server->addr.sockAddr6.sin6_addr); 126 sprintf(dp, "ip6=%pi6", &server->addr.sockAddr6.sin6_addr);
128 else 127 else
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 71b7661e2260..cd54fee3f05c 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2058,8 +2058,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
2058 rc = -ENOMEM; 2058 rc = -ENOMEM;
2059 else { 2059 else {
2060 pSesInfo->server = srvTcp; 2060 pSesInfo->server = srvTcp;
2061 sprintf(pSesInfo->serverName, "%u.%u.%u.%u", 2061 sprintf(pSesInfo->serverName, "%pI4",
2062 NIPQUAD(sin_server.sin_addr.s_addr)); 2062 &sin_server.sin_addr.s_addr);
2063 } 2063 }
2064 2064
2065 if (!rc) { 2065 if (!rc) {