Merge branch 'devel' into next
[sfrench/cifs-2.6.git] / fs / lockd / host.c
index acc2aa5021d1a8e8c6dee3b0392059b75d08e015..abdebf76b8203c12a6a12532e12f498b83a90614 100644 (file)
@@ -116,14 +116,14 @@ 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, NIP6_FMT, NIP6(sin6->sin6_addr));
+                       snprintf(buf, len, "%pI6", &sin6->sin6_addr);
                break;
        default:
                snprintf(buf, len, "unsupported address family");