dlm: printk with ll
PATCH 5/7 dlm: printk with ll
Use ll printk format for 64 bit values.
Signed-off-by David Teigland <[email protected]>
drivers/dlm/debug_fs.c +2 -2
@@ -63,12 +63,12 @@ static void print_lock(struct seq_file */* FIXME: this warns on Alpha */ if (lkb->lkb_status ==DLM_LKSTS_CONVERT || lkb->lkb_status ==DLM_LKSTS_GRANTED ) -seq_printf (s," %" PRIx64"-%" PRIx64, +seq_printf (s," %llx-%llx" , lkb->lkb_range[GR_RANGE_START ], lkb->lkb_range[GR_RANGE_END ]);if (lkb->lkb_status ==DLM_LKSTS_CONVERT || lkb->lkb_status ==DLM_LKSTS_WAITING ) -seq_printf (s," (%" PRIx64"-%" PRIx64")" , +seq_printf (s," (%llx-%llx)" , lkb->lkb_range[RQ_RANGE_START ], lkb->lkb_range[RQ_RANGE_END ]); }
drivers/dlm/dlm_internal.h +0 -6
@@ -42,12 +42,6 @@#define DLM_LOCKSPACE_LEN 64 -#if (BITS_PER_LONG ==64 ) -#define PRIx64 "lx" -#else -#define PRIx64 "Lx" -#endif -/* Size of the temp buffer midcomms allocates on the stack. We try to make this large enough so most messages fit. FIXME: should sctp make this unnecessary? */
drivers/dlm/recover.c +1 -1
@@ -420,7 +420,7 @@ int dlm_recover_master_reply(struct dlm_ r =recover_list_find (ls, rc->rc_id);if (!r) { -log_error (ls,"dlm_recover_master_reply no id %" PRIx64"" , +log_error (ls,"dlm_recover_master_reply no id %llx" , rc->rc_id); goto out; }
drivers/dlm/recoverd.c +3 -3
@@ -45,7 +45,7 @@ static int ls_recover(struct dlm_ls *ls,unsigned long start;int error, neg =0 ; -log_debug (ls,"recover %" PRIx64"" , rv->seq); +log_debug (ls,"recover %llx" , rv->seq);down (&ls->ls_recoverd_active);
@@ -199,7 +199,7 @@ static int ls_recover(struct dlm_ls *ls,dlm_astd_wake (); -log_debug (ls,"recover %" PRIx64" done: %u ms" , rv->seq, +log_debug (ls,"recover %llx done: %u ms" , rv->seq,jiffies_to_msecs (jiffies - start));up (&ls->ls_recoverd_active);
@@ -207,7 +207,7 @@ static int ls_recover(struct dlm_ls *ls, fail:dlm_release_root_list (ls); -log_debug (ls,"recover %" PRIx64" error %d" , rv->seq, error); +log_debug (ls,"recover %llx error %d" , rv->seq, error);up (&ls->ls_recoverd_active);return error; }