aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/cluster/heartbeat.c38
1 files changed, 20 insertions, 18 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index d08971d29b63..bff0f0d06867 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -449,11 +449,11 @@ static u32 o2hb_compute_block_crc_le(struct o2hb_region *reg,
449 449
450static void o2hb_dump_slot(struct o2hb_disk_heartbeat_block *hb_block) 450static void o2hb_dump_slot(struct o2hb_disk_heartbeat_block *hb_block)
451{ 451{
452 mlog(ML_ERROR, "Dump slot information: seq = 0x%"MLFx64", node = %u, " 452 mlog(ML_ERROR, "Dump slot information: seq = 0x%llx, node = %u, "
453 "cksum = 0x%x, generation 0x%"MLFx64"\n", 453 "cksum = 0x%x, generation 0x%llx\n",
454 le64_to_cpu(hb_block->hb_seq), hb_block->hb_node, 454 (long long)le64_to_cpu(hb_block->hb_seq),
455 le32_to_cpu(hb_block->hb_cksum), 455 hb_block->hb_node, le32_to_cpu(hb_block->hb_cksum),
456 le64_to_cpu(hb_block->hb_generation)); 456 (long long)le64_to_cpu(hb_block->hb_generation));
457} 457}
458 458
459static int o2hb_verify_crc(struct o2hb_region *reg, 459static int o2hb_verify_crc(struct o2hb_region *reg,
@@ -516,8 +516,9 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg,
516 hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg, 516 hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg,
517 hb_block)); 517 hb_block));
518 518
519 mlog(ML_HB_BIO, "our node generation = 0x%"MLFx64", cksum = 0x%x\n", 519 mlog(ML_HB_BIO, "our node generation = 0x%llx, cksum = 0x%x\n",
520 cpu_to_le64(generation), le32_to_cpu(hb_block->hb_cksum)); 520 (long long)cpu_to_le64(generation),
521 le32_to_cpu(hb_block->hb_cksum));
521} 522}
522 523
523static void o2hb_fire_callbacks(struct o2hb_callback *hbcall, 524static void o2hb_fire_callbacks(struct o2hb_callback *hbcall,
@@ -686,19 +687,20 @@ static int o2hb_check_slot(struct o2hb_region *reg,
686 if (slot->ds_last_generation != le64_to_cpu(hb_block->hb_generation)) { 687 if (slot->ds_last_generation != le64_to_cpu(hb_block->hb_generation)) {
687 gen_changed = 1; 688 gen_changed = 1;
688 slot->ds_equal_samples = 0; 689 slot->ds_equal_samples = 0;
689 mlog(ML_HEARTBEAT, "Node %d changed generation (0x%"MLFx64" " 690 mlog(ML_HEARTBEAT, "Node %d changed generation (0x%llx "
690 "to 0x%"MLFx64")\n", slot->ds_node_num, 691 "to 0x%llx)\n", slot->ds_node_num,
691 slot->ds_last_generation, 692 (long long)slot->ds_last_generation,
692 le64_to_cpu(hb_block->hb_generation)); 693 (long long)le64_to_cpu(hb_block->hb_generation));
693 } 694 }
694 695
695 slot->ds_last_generation = le64_to_cpu(hb_block->hb_generation); 696 slot->ds_last_generation = le64_to_cpu(hb_block->hb_generation);
696 697
697 mlog(ML_HEARTBEAT, "Slot %d gen 0x%"MLFx64" cksum 0x%x " 698 mlog(ML_HEARTBEAT, "Slot %d gen 0x%llx cksum 0x%x "
698 "seq %"MLFu64" last %"MLFu64" changed %u equal %u\n", 699 "seq %llu last %llu changed %u equal %u\n",
699 slot->ds_node_num, slot->ds_last_generation, 700 slot->ds_node_num, (long long)slot->ds_last_generation,
700 le32_to_cpu(hb_block->hb_cksum), le64_to_cpu(hb_block->hb_seq), 701 le32_to_cpu(hb_block->hb_cksum),
701 slot->ds_last_time, slot->ds_changed_samples, 702 (unsigned long long)le64_to_cpu(hb_block->hb_seq),
703 (unsigned long long)slot->ds_last_time, slot->ds_changed_samples,
702 slot->ds_equal_samples); 704 slot->ds_equal_samples);
703 705
704 spin_lock(&o2hb_live_lock); 706 spin_lock(&o2hb_live_lock);
@@ -708,8 +710,8 @@ fire_callbacks:
708 * changes at any time during their dead time */ 710 * changes at any time during their dead time */
709 if (list_empty(&slot->ds_live_item) && 711 if (list_empty(&slot->ds_live_item) &&
710 slot->ds_changed_samples >= O2HB_LIVE_THRESHOLD) { 712 slot->ds_changed_samples >= O2HB_LIVE_THRESHOLD) {
711 mlog(ML_HEARTBEAT, "Node %d (id 0x%"MLFx64") joined my " 713 mlog(ML_HEARTBEAT, "Node %d (id 0x%llx) joined my region\n",
712 "region\n", slot->ds_node_num, slot->ds_last_generation); 714 slot->ds_node_num, (long long)slot->ds_last_generation);
713 715
714 /* first on the list generates a callback */ 716 /* first on the list generates a callback */
715 if (list_empty(&o2hb_live_slots[slot->ds_node_num])) { 717 if (list_empty(&o2hb_live_slots[slot->ds_node_num])) {