Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 (0c505273) · Commits · e / devices / android_kernel_xiaomi_markw

fs/ocfs2/alloc.c

+45 −43

Original line number	Original line	Diff line number	Diff line
	@@ -566,9 +566,8 @@ static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
	next_free = le16_to_cpu(el->l_next_free_rec);		next_free = le16_to_cpu(el->l_next_free_rec);
	if (next_free == 0) {		if (next_free == 0) {
	ocfs2_error(inode->i_sb,		ocfs2_error(inode->i_sb,
	"Dinode %"MLFu64" has a bad "		"Dinode %llu has a bad extent list",
	"extent list",		(unsigned long long)OCFS2_I(inode)->ip_blkno);
	OCFS2_I(inode)->ip_blkno);
	status = -EIO;		status = -EIO;
	goto bail;		goto bail;
	}		}
	@@ -611,9 +610,8 @@ static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
	next_free = le16_to_cpu(el->l_next_free_rec);		next_free = le16_to_cpu(el->l_next_free_rec);
	if (next_free == 0) {		if (next_free == 0) {
	ocfs2_error(inode->i_sb,		ocfs2_error(inode->i_sb,
	"Dinode %"MLFu64" has a bad "		"Dinode %llu has a bad extent list",
	"extent list",		(unsigned long long)OCFS2_I(inode)->ip_blkno);
	OCFS2_I(inode)->ip_blkno);
	status = -EIO;		status = -EIO;
	goto bail;		goto bail;
	}		}
	@@ -652,8 +650,9 @@ static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
	/* having an empty extent at eof is legal. */		/* having an empty extent at eof is legal. */
	if (el->l_recs[i].e_cpos != fe->i_clusters) {		if (el->l_recs[i].e_cpos != fe->i_clusters) {
	ocfs2_error(inode->i_sb,		ocfs2_error(inode->i_sb,
	"Dinode %"MLFu64" trailing extent is bad: "		"Dinode %llu trailing extent is bad: "
	"cpos (%u) != number of clusters (%u)",		"cpos (%u) != number of clusters (%u)",
			(unsigned long long)OCFS2_I(inode)->ip_blkno,
	le32_to_cpu(el->l_recs[i].e_cpos),		le32_to_cpu(el->l_recs[i].e_cpos),
	le32_to_cpu(fe->i_clusters));		le32_to_cpu(fe->i_clusters));
	status = -EIO;		status = -EIO;
	@@ -747,19 +746,19 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb,

	while(le16_to_cpu(el->l_tree_depth) > 1) {		while(le16_to_cpu(el->l_tree_depth) > 1) {
	if (le16_to_cpu(el->l_next_free_rec) == 0) {		if (le16_to_cpu(el->l_next_free_rec) == 0) {
	ocfs2_error(inode->i_sb, "Dinode %"MLFu64" has empty "		ocfs2_error(inode->i_sb, "Dinode %llu has empty "
	"extent list (next_free_rec == 0)",		"extent list (next_free_rec == 0)",
	OCFS2_I(inode)->ip_blkno);		(unsigned long long)OCFS2_I(inode)->ip_blkno);
	status = -EIO;		status = -EIO;
	goto bail;		goto bail;
	}		}
	i = le16_to_cpu(el->l_next_free_rec) - 1;		i = le16_to_cpu(el->l_next_free_rec) - 1;
	blkno = le64_to_cpu(el->l_recs[i].e_blkno);		blkno = le64_to_cpu(el->l_recs[i].e_blkno);
	if (!blkno) {		if (!blkno) {
	ocfs2_error(inode->i_sb, "Dinode %"MLFu64" has extent "		ocfs2_error(inode->i_sb, "Dinode %llu has extent "
	"list where extent # %d has no physical "		"list where extent # %d has no physical "
	"block start",		"block start",
	OCFS2_I(inode)->ip_blkno, i);		(unsigned long long)OCFS2_I(inode)->ip_blkno, i);
	status = -EIO;		status = -EIO;
	goto bail;		goto bail;
	}		}
	@@ -826,9 +825,9 @@ int ocfs2_insert_extent(struct ocfs2_super *osb,

	mlog_entry_void();		mlog_entry_void();

	mlog(0, "add %u clusters starting at block %"MLFu64" to "		mlog(0, "add %u clusters starting at block %llu to inode %llu\n",
	"inode %"MLFu64"\n",		new_clusters, (unsigned long long)start_blk,
	new_clusters, start_blk, OCFS2_I(inode)->ip_blkno);		(unsigned long long)OCFS2_I(inode)->ip_blkno);

	fe = (struct ocfs2_dinode *) fe_bh->b_data;		fe = (struct ocfs2_dinode *) fe_bh->b_data;
	el = &fe->id2.i_list;		el = &fe->id2.i_list;
	@@ -963,8 +962,8 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
	struct ocfs2_dinode *di;		struct ocfs2_dinode *di;
	struct ocfs2_truncate_log *tl;		struct ocfs2_truncate_log *tl;

	mlog_entry("start_blk = %"MLFu64", num_clusters = %u\n", start_blk,		mlog_entry("start_blk = %llu, num_clusters = %u\n",
	num_clusters);		(unsigned long long)start_blk, num_clusters);

	BUG_ON(mutex_trylock(&tl_inode->i_mutex));		BUG_ON(mutex_trylock(&tl_inode->i_mutex));

	@@ -981,8 +980,9 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
	tl_count = le16_to_cpu(tl->tl_count);		tl_count = le16_to_cpu(tl->tl_count);
	mlog_bug_on_msg(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) \|\|		mlog_bug_on_msg(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) \|\|
	tl_count == 0,		tl_count == 0,
	"Truncate record count on #%"MLFu64" invalid ("		"Truncate record count on #%llu invalid "
	"wanted %u, actual %u\n", OCFS2_I(tl_inode)->ip_blkno,		"wanted %u, actual %u\n",
			(unsigned long long)OCFS2_I(tl_inode)->ip_blkno,
	ocfs2_truncate_recs_per_inode(osb->sb),		ocfs2_truncate_recs_per_inode(osb->sb),
	le16_to_cpu(tl->tl_count));		le16_to_cpu(tl->tl_count));

	@@ -1002,8 +1002,8 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
	}		}

	mlog(0, "Log truncate of %u clusters starting at cluster %u to "		mlog(0, "Log truncate of %u clusters starting at cluster %u to "
	"%"MLFu64" (index = %d)\n", num_clusters, start_cluster,		"%llu (index = %d)\n", num_clusters, start_cluster,
	OCFS2_I(tl_inode)->ip_blkno, index);		(unsigned long long)OCFS2_I(tl_inode)->ip_blkno, index);

	if (ocfs2_truncate_log_can_coalesce(tl, start_cluster)) {		if (ocfs2_truncate_log_can_coalesce(tl, start_cluster)) {
	/*		/*
	@@ -1134,8 +1134,8 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
	}		}

	num_to_flush = le16_to_cpu(tl->tl_used);		num_to_flush = le16_to_cpu(tl->tl_used);
	mlog(0, "Flush %u records from truncate log #%"MLFu64"\n",		mlog(0, "Flush %u records from truncate log #%llu\n",
	num_to_flush, OCFS2_I(tl_inode)->ip_blkno);		num_to_flush, (unsigned long long)OCFS2_I(tl_inode)->ip_blkno);
	if (!num_to_flush) {		if (!num_to_flush) {
	status = 0;		status = 0;
	goto bail;		goto bail;
	@@ -1360,8 +1360,8 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,

	tl = &tl_copy->id2.i_dealloc;		tl = &tl_copy->id2.i_dealloc;
	num_recs = le16_to_cpu(tl->tl_used);		num_recs = le16_to_cpu(tl->tl_used);
	mlog(0, "cleanup %u records from %"MLFu64"\n", num_recs,		mlog(0, "cleanup %u records from %llu\n", num_recs,
	tl_copy->i_blkno);		(unsigned long long)tl_copy->i_blkno);

	mutex_lock(&tl_inode->i_mutex);		mutex_lock(&tl_inode->i_mutex);
	for(i = 0; i < num_recs; i++) {		for(i = 0; i < num_recs; i++) {
	@@ -1529,7 +1529,8 @@ static int ocfs2_find_new_last_ext_blk(struct ocfs2_super *osb,

	*new_last_eb = bh;		*new_last_eb = bh;
	get_bh(*new_last_eb);		get_bh(*new_last_eb);
	mlog(0, "returning block %"MLFu64"\n", le64_to_cpu(eb->h_blkno));		mlog(0, "returning block %llu\n",
			(unsigned long long)le64_to_cpu(eb->h_blkno));
	bail:		bail:
	if (bh)		if (bh)
	brelse(bh);		brelse(bh);
	@@ -1646,8 +1647,8 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,

	/* if our tree depth > 0, update all the tree blocks below us. */		/* if our tree depth > 0, update all the tree blocks below us. */
	while (depth) {		while (depth) {
	mlog(0, "traveling tree (depth = %d, next_eb = %"MLFu64")\n",		mlog(0, "traveling tree (depth = %d, next_eb = %llu)\n",
	depth, next_eb);		depth, (unsigned long long)next_eb);
	status = ocfs2_read_block(osb, next_eb, &eb_bh,		status = ocfs2_read_block(osb, next_eb, &eb_bh,
	OCFS2_BH_CACHED, inode);		OCFS2_BH_CACHED, inode);
	if (status < 0) {		if (status < 0) {
	@@ -1674,12 +1675,12 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,

	i = le16_to_cpu(el->l_next_free_rec) - 1;		i = le16_to_cpu(el->l_next_free_rec) - 1;

	mlog(0, "extent block %"MLFu64", before: record %d: "		mlog(0, "extent block %llu, before: record %d: "
	"(%u, %u, %"MLFu64"), next = %u\n",		"(%u, %u, %llu), next = %u\n",
	le64_to_cpu(eb->h_blkno), i,		(unsigned long long)le64_to_cpu(eb->h_blkno), i,
	le32_to_cpu(el->l_recs[i].e_cpos),		le32_to_cpu(el->l_recs[i].e_cpos),
	le32_to_cpu(el->l_recs[i].e_clusters),		le32_to_cpu(el->l_recs[i].e_clusters),
	le64_to_cpu(el->l_recs[i].e_blkno),		(unsigned long long)le64_to_cpu(el->l_recs[i].e_blkno),
	le16_to_cpu(el->l_next_free_rec));		le16_to_cpu(el->l_next_free_rec));

	BUG_ON(le32_to_cpu(el->l_recs[i].e_clusters) < clusters_to_del);		BUG_ON(le32_to_cpu(el->l_recs[i].e_clusters) < clusters_to_del);
	@@ -1697,12 +1698,12 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
	BUG_ON(!el->l_next_free_rec);		BUG_ON(!el->l_next_free_rec);
	le16_add_cpu(&el->l_next_free_rec, -1);		le16_add_cpu(&el->l_next_free_rec, -1);
	}		}
	mlog(0, "extent block %"MLFu64", after: record %d: "		mlog(0, "extent block %llu, after: record %d: "
	"(%u, %u, %"MLFu64"), next = %u\n",		"(%u, %u, %llu), next = %u\n",
	le64_to_cpu(eb->h_blkno), i,		(unsigned long long)le64_to_cpu(eb->h_blkno), i,
	le32_to_cpu(el->l_recs[i].e_cpos),		le32_to_cpu(el->l_recs[i].e_cpos),
	le32_to_cpu(el->l_recs[i].e_clusters),		le32_to_cpu(el->l_recs[i].e_clusters),
	le64_to_cpu(el->l_recs[i].e_blkno),		(unsigned long long)le64_to_cpu(el->l_recs[i].e_blkno),
	le16_to_cpu(el->l_next_free_rec));		le16_to_cpu(el->l_next_free_rec));

	status = ocfs2_journal_dirty(handle, eb_bh);		status = ocfs2_journal_dirty(handle, eb_bh);
	@@ -1792,10 +1793,10 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
	last_eb = le64_to_cpu(fe->i_last_eb_blk);		last_eb = le64_to_cpu(fe->i_last_eb_blk);
	start:		start:
	mlog(0, "ocfs2_commit_truncate: fe->i_clusters = %u, "		mlog(0, "ocfs2_commit_truncate: fe->i_clusters = %u, "
	"last_eb = %"MLFu64", fe->i_last_eb_blk = %"MLFu64", "		"last_eb = %llu, fe->i_last_eb_blk = %llu, "
	"fe->id2.i_list.l_tree_depth = %u last_eb_bh = %p\n",		"fe->id2.i_list.l_tree_depth = %u last_eb_bh = %p\n",
	le32_to_cpu(fe->i_clusters), last_eb,		le32_to_cpu(fe->i_clusters), (unsigned long long)last_eb,
	le64_to_cpu(fe->i_last_eb_blk),		(unsigned long long)le64_to_cpu(fe->i_last_eb_blk),
	le16_to_cpu(fe->id2.i_list.l_tree_depth), last_eb_bh);		le16_to_cpu(fe->id2.i_list.l_tree_depth), last_eb_bh);

	if (last_eb != le64_to_cpu(fe->i_last_eb_blk)) {		if (last_eb != le64_to_cpu(fe->i_last_eb_blk)) {
	@@ -1934,16 +1935,17 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb,
	fe = (struct ocfs2_dinode *) fe_bh->b_data;		fe = (struct ocfs2_dinode *) fe_bh->b_data;

	mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="		mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="
	"%"MLFu64"\n", fe->i_clusters, new_i_clusters, fe->i_size);		"%llu\n", fe->i_clusters, new_i_clusters,
			(unsigned long long)fe->i_size);

	if (le32_to_cpu(fe->i_clusters) <= new_i_clusters) {		if (le32_to_cpu(fe->i_clusters) <= new_i_clusters) {
	ocfs2_error(inode->i_sb, "Dinode %"MLFu64" has cluster count "		ocfs2_error(inode->i_sb, "Dinode %llu has cluster count "
	"%u and size %"MLFu64" whereas struct inode has "		"%u and size %llu whereas struct inode has "
	"cluster count %u and size %llu which caused an "		"cluster count %u and size %llu which caused an "
	"invalid truncate to %u clusters.",		"invalid truncate to %u clusters.",
	le64_to_cpu(fe->i_blkno),		(unsigned long long)le64_to_cpu(fe->i_blkno),
	le32_to_cpu(fe->i_clusters),		le32_to_cpu(fe->i_clusters),
	le64_to_cpu(fe->i_size),		(unsigned long long)le64_to_cpu(fe->i_size),
	OCFS2_I(inode)->ip_clusters, i_size_read(inode),		OCFS2_I(inode)->ip_clusters, i_size_read(inode),
	new_i_clusters);		new_i_clusters);
	mlog_meta_lvb(ML_ERROR, &OCFS2_I(inode)->ip_meta_lockres);		mlog_meta_lvb(ML_ERROR, &OCFS2_I(inode)->ip_meta_lockres);

fs/ocfs2/aops.c

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -74,8 +74,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
	fe = (struct ocfs2_dinode *) bh->b_data;		fe = (struct ocfs2_dinode *) bh->b_data;

	if (!OCFS2_IS_VALID_DINODE(fe)) {		if (!OCFS2_IS_VALID_DINODE(fe)) {
	mlog(ML_ERROR, "Invalid dinode #%"MLFu64": signature = %.*s\n",		mlog(ML_ERROR, "Invalid dinode #%llu: signature = %.*s\n",
	fe->i_blkno, 7, fe->i_signature);		(unsigned long long)fe->i_blkno, 7, fe->i_signature);
	goto bail;		goto bail;
	}		}

	@@ -162,8 +162,8 @@ static int ocfs2_get_block(struct inode *inode, sector_t iblock,
	NULL);		NULL);
	if (err) {		if (err) {
	mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "		mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
	"%"MLFu64", NULL)\n", err, inode,		"%llu, NULL)\n", err, inode, (unsigned long long)iblock,
	(unsigned long long)iblock, p_blkno);		(unsigned long long)p_blkno);
	goto bail;		goto bail;
	}		}

	@@ -171,13 +171,15 @@ static int ocfs2_get_block(struct inode *inode, sector_t iblock,

	if (bh_result->b_blocknr == 0) {		if (bh_result->b_blocknr == 0) {
	err = -EIO;		err = -EIO;
	mlog(ML_ERROR, "iblock = %llu p_blkno = %"MLFu64" "		mlog(ML_ERROR, "iblock = %llu p_blkno = %llu blkno=(%llu)\n",
	"blkno=(%"MLFu64")\n", (unsigned long long)iblock,		(unsigned long long)iblock,
	p_blkno, OCFS2_I(inode)->ip_blkno);		(unsigned long long)p_blkno,
			(unsigned long long)OCFS2_I(inode)->ip_blkno);
	}		}

	past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));		past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));
	mlog(0, "Inode %lu, past_eof = %"MLFu64"\n", inode->i_ino, past_eof);		mlog(0, "Inode %lu, past_eof = %llu\n", inode->i_ino,
			(unsigned long long)past_eof);

	if (create && (iblock >= past_eof))		if (create && (iblock >= past_eof))
	set_buffer_new(bh_result);		set_buffer_new(bh_result);

fs/ocfs2/buffer_head_io.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -97,8 +97,8 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
	int i, ignore_cache = 0;		int i, ignore_cache = 0;
	struct buffer_head *bh;		struct buffer_head *bh;

	mlog_entry("(block=(%"MLFu64"), nr=(%d), flags=%d, inode=%p)\n",		mlog_entry("(block=(%llu), nr=(%d), flags=%d, inode=%p)\n",
	block, nr, flags, inode);		(unsigned long long)block, nr, flags, inode);

	if (osb == NULL \|\| osb->sb == NULL \|\| bhs == NULL) {		if (osb == NULL \|\| osb->sb == NULL \|\| bhs == NULL) {
	status = -EINVAL;		status = -EINVAL;
	@@ -143,9 +143,9 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
	if (flags & OCFS2_BH_CACHED &&		if (flags & OCFS2_BH_CACHED &&
	!ocfs2_buffer_uptodate(inode, bh)) {		!ocfs2_buffer_uptodate(inode, bh)) {
	mlog(ML_UPTODATE,		mlog(ML_UPTODATE,
	"bh (%llu), inode %"MLFu64" not uptodate\n",		"bh (%llu), inode %llu not uptodate\n",
	(unsigned long long)bh->b_blocknr,		(unsigned long long)bh->b_blocknr,
	OCFS2_I(inode)->ip_blkno);		(unsigned long long)OCFS2_I(inode)->ip_blkno);
	ignore_cache = 1;		ignore_cache = 1;
	}		}

	@@ -222,7 +222,8 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
	if (inode)		if (inode)
	mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);		mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);

	mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr,		mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s\n",
			(unsigned long long)block, nr,
	(!(flags & OCFS2_BH_CACHED) \|\| ignore_cache) ? "no" : "yes");		(!(flags & OCFS2_BH_CACHED) \|\| ignore_cache) ? "no" : "yes");

	bail:		bail:

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 @@ fire_callbacks:
	* 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])) {

fs/ocfs2/cluster/masklog.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -256,16 +256,6 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
	} \		} \
	} while (0)		} while (0)

	#if (BITS_PER_LONG == 32) \|\| defined(CONFIG_X86_64) \|\| (defined(CONFIG_UML_X86) && defined(CONFIG_64BIT))
	#define MLFi64 "lld"
	#define MLFu64 "llu"
	#define MLFx64 "llx"
	#else
	#define MLFi64 "ld"
	#define MLFu64 "lu"
	#define MLFx64 "lx"
	#endif

	#include <linux/kobject.h>		#include <linux/kobject.h>
	#include <linux/sysfs.h>		#include <linux/sysfs.h>
	int mlog_sys_init(struct subsystem *o2cb_subsys);		int mlog_sys_init(struct subsystem *o2cb_subsys);