Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / fs / ocfs2 / cluster / netdebug.c

diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 52276c02f71041665ba3389b9d690e46e8c075dd..f8424874fa0725b95065d5ce7031f63d0cdde586 100644 (file)
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -304,8 +304,8 @@ static int sc_seq_show(struct seq_file *seq, void *v)
                 * use of it here generates a warning with -Wbitwise */
                seq_printf(seq, "%p:\n"
                           "  krefs:           %d\n"
-                          "  sock:            %u.%u.%u.%u:%u -> "
-                                             "%u.%u.%u.%u:%u\n"
+                          "  sock:            %pI4:%u -> "
+                                             "%pI4:%u\n"
                           "  remote node:     %s\n"
                           "  page off:        %zu\n"
                           "  handshake ok:    %u\n"
@@ -319,8 +319,8 @@ static int sc_seq_show(struct seq_file *seq, void *v)
                           "  func type:       %u\n",
                           sc,
                           atomic_read(&sc->sc_kref.refcount),
-                          NIPQUAD(saddr), inet ? ntohs(sport) : 0,
-                          NIPQUAD(daddr), inet ? ntohs(dport) : 0,
+                          &saddr, inet ? ntohs(sport) : 0,
+                          &daddr, inet ? ntohs(dport) : 0,
                           sc->sc_node->nd_name,
                           sc->sc_page_off,
                           sc->sc_handshake_ok,