diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 00:56:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 00:56:28 -0700 |
| commit | be859405487324ed548f1ba11dc949b8230ab991 (patch) | |
| tree | 3893ac2ce3b212b100d9e1e1e3e2fc1fa0c3f47f /fs/lockd | |
| parent | 63779436ab4ad0867bcea53bf853b0004d7b895d (diff) | |
| download | lwn-be859405487324ed548f1ba11dc949b8230ab991.tar.gz lwn-be859405487324ed548f1ba11dc949b8230ab991.zip | |
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/lockd')
| -rw-r--r-- | fs/lockd/host.c | 6 | ||||
| -rw-r--r-- | fs/lockd/mon.c | 2 |
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; } |