Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / cluster / netdebug.c

diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 7bf3c0ea7bd93cee0254903893ca89d7ce9fd2e1..52276c02f71041665ba3389b9d690e46e8c075dd 100644 (file)
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -138,18 +138,20 @@ static int nst_seq_show(struct seq_file *seq, void *v)
                           "  message id:   %d\n"
                           "  message type: %u\n"
                           "  message key:  0x%08x\n"
-                          "  sock acquiry: %lu.%lu\n"
-                          "  send start:   %lu.%lu\n"
-                          "  wait start:   %lu.%lu\n",
+                          "  sock acquiry: %lu.%ld\n"
+                          "  send start:   %lu.%ld\n"
+                          "  wait start:   %lu.%ld\n",
                           nst, (unsigned long)nst->st_task->pid,
                           (unsigned long)nst->st_task->tgid,
                           nst->st_task->comm, nst->st_node,
                           nst->st_sc, nst->st_id, nst->st_msg_type,
                           nst->st_msg_key,
-                          nst->st_sock_time.tv_sec, nst->st_sock_time.tv_usec,
-                          nst->st_send_time.tv_sec, nst->st_send_time.tv_usec,
+                          nst->st_sock_time.tv_sec,
+                          (long)nst->st_sock_time.tv_usec,
+                          nst->st_send_time.tv_sec,
+                          (long)nst->st_send_time.tv_usec,
                           nst->st_status_time.tv_sec,
-                          nst->st_status_time.tv_usec);
+                          (long)nst->st_status_time.tv_usec);
        }
 
        spin_unlock(&o2net_debug_lock);
@@ -274,7 +276,7 @@ static void *sc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
        return sc; /* unused, just needs to be null when done */
 }
 
-#define TV_SEC_USEC(TV) TV.tv_sec, TV.tv_usec
+#define TV_SEC_USEC(TV) TV.tv_sec, (long)TV.tv_usec
 
 static int sc_seq_show(struct seq_file *seq, void *v)
 {
@@ -307,12 +309,12 @@ static int sc_seq_show(struct seq_file *seq, void *v)
                           "  remote node:     %s\n"
                           "  page off:        %zu\n"
                           "  handshake ok:    %u\n"
-                          "  timer:           %lu.%lu\n"
-                          "  data ready:      %lu.%lu\n"
-                          "  advance start:   %lu.%lu\n"
-                          "  advance stop:    %lu.%lu\n"
-                          "  func start:      %lu.%lu\n"
-                          "  func stop:       %lu.%lu\n"
+                          "  timer:           %lu.%ld\n"
+                          "  data ready:      %lu.%ld\n"
+                          "  advance start:   %lu.%ld\n"
+                          "  advance stop:    %lu.%ld\n"
+                          "  func start:      %lu.%ld\n"
+                          "  func stop:       %lu.%ld\n"
                           "  func key:        %u\n"
                           "  func type:       %u\n",
                           sc,