Merge branch 'devel' into next
[sfrench/cifs-2.6.git] / fs / nfs / super.c
index bd4c3dd550df99f7ba8eb5d704ca481f4962ae87..d6686f4786dc55b5d5f06afe913e2930f2b45b96 100644 (file)
@@ -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: