Commit 78d57e45 authored by Brian Foster's avatar Brian Foster Committed by Dave Chinner
Browse files

xfs: icreate log item recovery and cancellation tracepoints 



Various log items have recovery tracepoints to identify whether a
particular log item is recovered or cancelled. Add the equivalent
tracepoints for the icreate transaction.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent f0b2efad

fs/xfs/xfs_log_recover.c

+4 −1
Original line number Diff line number Diff line
@@ -3100,9 +3100,12 @@ xlog_recover_do_icreate_pass2( 
	 * done easily.

	 */

	if (xlog_check_buffer_cancelled(log,

			XFS_AGB_TO_DADDR(mp, agno, agbno), length, 0))

			XFS_AGB_TO_DADDR(mp, agno, agbno), length, 0)) {

		trace_xfs_log_recover_icreate_cancel(log, icl);

		return 0;

	}



	trace_xfs_log_recover_icreate_recover(log, icl);

	xfs_ialloc_inode_init(mp, NULL, buffer_list, count, agno, agbno, length,

			      be32_to_cpu(icl->icl_gen));

	return 0;

fs/xfs/xfs_trace.h

+34 −0
Original line number Diff line number Diff line
@@ -2089,6 +2089,40 @@ DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover); 
DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_cancel);

DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_skip);



DECLARE_EVENT_CLASS(xfs_log_recover_icreate_item_class,

	TP_PROTO(struct xlog *log, struct xfs_icreate_log *in_f),

	TP_ARGS(log, in_f),

	TP_STRUCT__entry(

		__field(dev_t, dev)

		__field(xfs_agnumber_t, agno)

		__field(xfs_agblock_t, agbno)

		__field(unsigned int, count)

		__field(unsigned int, isize)

		__field(xfs_agblock_t, length)

		__field(unsigned int, gen)

	),

	TP_fast_assign(

		__entry->dev = log->l_mp->m_super->s_dev;

		__entry->agno = be32_to_cpu(in_f->icl_ag);

		__entry->agbno = be32_to_cpu(in_f->icl_agbno);

		__entry->count = be32_to_cpu(in_f->icl_count);

		__entry->isize = be32_to_cpu(in_f->icl_isize);

		__entry->length = be32_to_cpu(in_f->icl_length);

		__entry->gen = be32_to_cpu(in_f->icl_gen);

	),

	TP_printk("dev %d:%d agno %u agbno %u count %u isize %u length %u "

		  "gen %u", MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->agno, __entry->agbno, __entry->count, __entry->isize,

		  __entry->length, __entry->gen)

)

#define DEFINE_LOG_RECOVER_ICREATE_ITEM(name) \

DEFINE_EVENT(xfs_log_recover_icreate_item_class, name, \

	TP_PROTO(struct xlog *log, struct xfs_icreate_log *in_f), \

	TP_ARGS(log, in_f))



DEFINE_LOG_RECOVER_ICREATE_ITEM(xfs_log_recover_icreate_cancel);

DEFINE_LOG_RECOVER_ICREATE_ITEM(xfs_log_recover_icreate_recover);



DECLARE_EVENT_CLASS(xfs_discard_class,

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,

		 xfs_agblock_t agbno, xfs_extlen_t len),