ocfs2: don't use MLF* in cluster/ files (70bacbdb) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/ocfs2/cluster/heartbeat.c

+20 −18

Original line number	Original line	Diff line number	Diff line
	@@ -449,11 +449,11 @@ static u32 o2hb_compute_block_crc_le(struct o2hb_region *reg,

	static void o2hb_dump_slot(struct o2hb_disk_heartbeat_block *hb_block)		static void o2hb_dump_slot(struct o2hb_disk_heartbeat_block *hb_block)
	{		{
	mlog(ML_ERROR, "Dump slot information: seq = 0x%"MLFx64", node = %u, "		mlog(ML_ERROR, "Dump slot information: seq = 0x%llx, node = %u, "
	"cksum = 0x%x, generation 0x%"MLFx64"\n",		"cksum = 0x%x, generation 0x%llx\n",
	le64_to_cpu(hb_block->hb_seq), hb_block->hb_node,		(long long)le64_to_cpu(hb_block->hb_seq),
	le32_to_cpu(hb_block->hb_cksum),		hb_block->hb_node, le32_to_cpu(hb_block->hb_cksum),
	le64_to_cpu(hb_block->hb_generation));		(long long)le64_to_cpu(hb_block->hb_generation));
	}		}

	static int o2hb_verify_crc(struct o2hb_region *reg,		static int o2hb_verify_crc(struct o2hb_region *reg,
	@@ -516,8 +516,9 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg,
	hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg,		hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg,
	hb_block));		hb_block));

	mlog(ML_HB_BIO, "our node generation = 0x%"MLFx64", cksum = 0x%x\n",		mlog(ML_HB_BIO, "our node generation = 0x%llx, cksum = 0x%x\n",
	cpu_to_le64(generation), le32_to_cpu(hb_block->hb_cksum));		(long long)cpu_to_le64(generation),
			le32_to_cpu(hb_block->hb_cksum));
	}		}

	static void o2hb_fire_callbacks(struct o2hb_callback *hbcall,		static void o2hb_fire_callbacks(struct o2hb_callback *hbcall,
	@@ -686,19 +687,20 @@ static int o2hb_check_slot(struct o2hb_region *reg,
	if (slot->ds_last_generation != le64_to_cpu(hb_block->hb_generation)) {		if (slot->ds_last_generation != le64_to_cpu(hb_block->hb_generation)) {
	gen_changed = 1;		gen_changed = 1;
	slot->ds_equal_samples = 0;		slot->ds_equal_samples = 0;
	mlog(ML_HEARTBEAT, "Node %d changed generation (0x%"MLFx64" "		mlog(ML_HEARTBEAT, "Node %d changed generation (0x%llx "
	"to 0x%"MLFx64")\n", slot->ds_node_num,		"to 0x%llx)\n", slot->ds_node_num,
	slot->ds_last_generation,		(long long)slot->ds_last_generation,
	le64_to_cpu(hb_block->hb_generation));		(long long)le64_to_cpu(hb_block->hb_generation));
	}		}

	slot->ds_last_generation = le64_to_cpu(hb_block->hb_generation);		slot->ds_last_generation = le64_to_cpu(hb_block->hb_generation);

	mlog(ML_HEARTBEAT, "Slot %d gen 0x%"MLFx64" cksum 0x%x "		mlog(ML_HEARTBEAT, "Slot %d gen 0x%llx cksum 0x%x "
	"seq %"MLFu64" last %"MLFu64" changed %u equal %u\n",		"seq %llu last %llu changed %u equal %u\n",
	slot->ds_node_num, slot->ds_last_generation,		slot->ds_node_num, (long long)slot->ds_last_generation,
	le32_to_cpu(hb_block->hb_cksum), le64_to_cpu(hb_block->hb_seq),		le32_to_cpu(hb_block->hb_cksum),
	slot->ds_last_time, slot->ds_changed_samples,		(unsigned long long)le64_to_cpu(hb_block->hb_seq),
			(unsigned long long)slot->ds_last_time, slot->ds_changed_samples,
	slot->ds_equal_samples);		slot->ds_equal_samples);

	spin_lock(&o2hb_live_lock);		spin_lock(&o2hb_live_lock);
	@@ -708,8 +710,8 @@ static int o2hb_check_slot(struct o2hb_region *reg,
	* changes at any time during their dead time */		* changes at any time during their dead time */
	if (list_empty(&slot->ds_live_item) &&		if (list_empty(&slot->ds_live_item) &&
	slot->ds_changed_samples >= O2HB_LIVE_THRESHOLD) {		slot->ds_changed_samples >= O2HB_LIVE_THRESHOLD) {
	mlog(ML_HEARTBEAT, "Node %d (id 0x%"MLFx64") joined my "		mlog(ML_HEARTBEAT, "Node %d (id 0x%llx) joined my region\n",
	"region\n", slot->ds_node_num, slot->ds_last_generation);		slot->ds_node_num, (long long)slot->ds_last_generation);

	/* first on the list generates a callback */		/* first on the list generates a callback */
	if (list_empty(&o2hb_live_slots[slot->ds_node_num])) {		if (list_empty(&o2hb_live_slots[slot->ds_node_num])) {