Commit 47492ed1 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: pass btree cursors to rmap btree tracepoints 



Prepare the rmap btree tracepoints for use with realtime rmap btrees by
making them take the btree cursor object as a parameter.  This will save
us a lot of trouble later on.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 71f5a17e

fs/xfs/libxfs/xfs_rmap.c

+73 −111
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ xfs_rmap_update( 
	union xfs_btree_rec	rec;

	int			error;



	trace_xfs_rmap_update(cur->bc_mp, cur->bc_ag.pag->pag_agno,

			irec->rm_startblock, irec->rm_blockcount,

	trace_xfs_rmap_update(cur, irec->rm_startblock, irec->rm_blockcount,

			irec->rm_owner, irec->rm_offset, irec->rm_flags);



	rec.rmap.rm_startblock = cpu_to_be32(irec->rm_startblock);
@@ -127,8 +126,7 @@ xfs_rmap_insert( 
	int			i;

	int			error;



	trace_xfs_rmap_insert(rcur->bc_mp, rcur->bc_ag.pag->pag_agno, agbno,

			len, owner, offset, flags);

	trace_xfs_rmap_insert(rcur, agbno, len, owner, offset, flags);



	error = xfs_rmap_lookup_eq(rcur, agbno, len, owner, offset, flags, &i);

	if (error)
@@ -170,8 +168,7 @@ xfs_rmap_delete( 
	int			i;

	int			error;



	trace_xfs_rmap_delete(rcur->bc_mp, rcur->bc_ag.pag->pag_agno, agbno,

			len, owner, offset, flags);

	trace_xfs_rmap_delete(rcur, agbno, len, owner, offset, flags);



	error = xfs_rmap_lookup_eq(rcur, agbno, len, owner, offset, flags, &i);

	if (error)
@@ -339,8 +336,7 @@ xfs_rmap_find_left_neighbor_helper( 
{

	struct xfs_find_left_neighbor_info	*info = priv;



	trace_xfs_rmap_find_left_neighbor_candidate(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, rec->rm_startblock,

	trace_xfs_rmap_find_left_neighbor_candidate(cur, rec->rm_startblock,

			rec->rm_blockcount, rec->rm_owner, rec->rm_offset,

			rec->rm_flags);
@@ -390,8 +386,8 @@ xfs_rmap_find_left_neighbor( 
	info.high.rm_blockcount = 0;

	info.irec = irec;



	trace_xfs_rmap_find_left_neighbor_query(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, bno, 0, owner, offset, flags);

	trace_xfs_rmap_find_left_neighbor_query(cur, bno, 0, owner, offset,

			flags);



	/*

	 * Historically, we always used the range query to walk every reverse
@@ -422,8 +418,7 @@ xfs_rmap_find_left_neighbor( 
		return error;



	*stat = 1;

	trace_xfs_rmap_find_left_neighbor_result(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, irec->rm_startblock,

	trace_xfs_rmap_find_left_neighbor_result(cur, irec->rm_startblock,

			irec->rm_blockcount, irec->rm_owner, irec->rm_offset,

			irec->rm_flags);

	return 0;
@@ -438,8 +433,7 @@ xfs_rmap_lookup_le_range_helper( 
{

	struct xfs_find_left_neighbor_info	*info = priv;



	trace_xfs_rmap_lookup_le_range_candidate(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, rec->rm_startblock,

	trace_xfs_rmap_lookup_le_range_candidate(cur, rec->rm_startblock,

			rec->rm_blockcount, rec->rm_owner, rec->rm_offset,

			rec->rm_flags);
@@ -486,8 +480,7 @@ xfs_rmap_lookup_le_range( 
	*stat = 0;

	info.irec = irec;



	trace_xfs_rmap_lookup_le_range(cur->bc_mp, cur->bc_ag.pag->pag_agno,

			bno, 0, owner, offset, flags);

	trace_xfs_rmap_lookup_le_range(cur, bno, 0, owner, offset, flags);



	/*

	 * Historically, we always used the range query to walk every reverse
@@ -518,8 +511,7 @@ xfs_rmap_lookup_le_range( 
		return error;



	*stat = 1;

	trace_xfs_rmap_lookup_le_range_result(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, irec->rm_startblock,

	trace_xfs_rmap_lookup_le_range_result(cur, irec->rm_startblock,

			irec->rm_blockcount, irec->rm_owner, irec->rm_offset,

			irec->rm_flags);

	return 0;
@@ -631,8 +623,7 @@ xfs_rmap_unmap( 
			(flags & XFS_RMAP_BMBT_BLOCK);

	if (unwritten)

		flags |= XFS_RMAP_UNWRITTEN;

	trace_xfs_rmap_unmap(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_unmap(cur, bno, len, unwritten, oinfo);



	/*

	 * We should always have a left record because there's a static record
@@ -648,10 +639,9 @@ xfs_rmap_unmap( 
		goto out_error;

	}



	trace_xfs_rmap_lookup_le_range_result(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, ltrec.rm_startblock,

			ltrec.rm_blockcount, ltrec.rm_owner,

			ltrec.rm_offset, ltrec.rm_flags);

	trace_xfs_rmap_lookup_le_range_result(cur, ltrec.rm_startblock,

			ltrec.rm_blockcount, ltrec.rm_owner, ltrec.rm_offset,

			ltrec.rm_flags);

	ltoff = ltrec.rm_offset;



	/*
@@ -718,10 +708,9 @@ xfs_rmap_unmap( 


	if (ltrec.rm_startblock == bno && ltrec.rm_blockcount == len) {

		/* exact match, simply remove the record from rmap tree */

		trace_xfs_rmap_delete(mp, cur->bc_ag.pag->pag_agno,

				ltrec.rm_startblock, ltrec.rm_blockcount,

				ltrec.rm_owner, ltrec.rm_offset,

				ltrec.rm_flags);

		trace_xfs_rmap_delete(cur, ltrec.rm_startblock,

				ltrec.rm_blockcount, ltrec.rm_owner,

				ltrec.rm_offset, ltrec.rm_flags);

		error = xfs_btree_delete(cur, &i);

		if (error)

			goto out_error;
@@ -797,8 +786,7 @@ xfs_rmap_unmap( 
		else

			cur->bc_rec.r.rm_offset = offset + len;

		cur->bc_rec.r.rm_flags = flags;

		trace_xfs_rmap_insert(mp, cur->bc_ag.pag->pag_agno,

				cur->bc_rec.r.rm_startblock,

		trace_xfs_rmap_insert(cur, cur->bc_rec.r.rm_startblock,

				cur->bc_rec.r.rm_blockcount,

				cur->bc_rec.r.rm_owner,

				cur->bc_rec.r.rm_offset,
@@ -809,8 +797,7 @@ xfs_rmap_unmap( 
	}



out_done:

	trace_xfs_rmap_unmap_done(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_unmap_done(cur, bno, len, unwritten, oinfo);

out_error:

	if (error)

		trace_xfs_rmap_unmap_error(cur, error, _RET_IP_);
@@ -983,8 +970,7 @@ xfs_rmap_map( 
			(flags & XFS_RMAP_BMBT_BLOCK);

	if (unwritten)

		flags |= XFS_RMAP_UNWRITTEN;

	trace_xfs_rmap_map(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_map(cur, bno, len, unwritten, oinfo);

	ASSERT(!xfs_rmap_should_skip_owner_update(oinfo));



	/*
@@ -997,8 +983,7 @@ xfs_rmap_map( 
	if (error)

		goto out_error;

	if (have_lt) {

		trace_xfs_rmap_lookup_le_range_result(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, ltrec.rm_startblock,

		trace_xfs_rmap_lookup_le_range_result(cur, ltrec.rm_startblock,

				ltrec.rm_blockcount, ltrec.rm_owner,

				ltrec.rm_offset, ltrec.rm_flags);
@@ -1036,10 +1021,10 @@ xfs_rmap_map( 
			error = -EFSCORRUPTED;

			goto out_error;

		}

		trace_xfs_rmap_find_right_neighbor_result(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, gtrec.rm_startblock,

			gtrec.rm_blockcount, gtrec.rm_owner,

			gtrec.rm_offset, gtrec.rm_flags);

		trace_xfs_rmap_find_right_neighbor_result(cur,

				gtrec.rm_startblock, gtrec.rm_blockcount,

				gtrec.rm_owner, gtrec.rm_offset,

				gtrec.rm_flags);

		if (!xfs_rmap_is_mergeable(&gtrec, owner, flags))

			have_gt = 0;

	}
@@ -1076,12 +1061,9 @@ xfs_rmap_map( 
			 * result: |rrrrrrrrrrrrrrrrrrrrrrrrrrrrr|

			 */

			ltrec.rm_blockcount += gtrec.rm_blockcount;

			trace_xfs_rmap_delete(mp, cur->bc_ag.pag->pag_agno,

					gtrec.rm_startblock,

					gtrec.rm_blockcount,

					gtrec.rm_owner,

					gtrec.rm_offset,

					gtrec.rm_flags);

			trace_xfs_rmap_delete(cur, gtrec.rm_startblock,

					gtrec.rm_blockcount, gtrec.rm_owner,

					gtrec.rm_offset, gtrec.rm_flags);

			error = xfs_btree_delete(cur, &i);

			if (error)

				goto out_error;
@@ -1128,8 +1110,7 @@ xfs_rmap_map( 
		cur->bc_rec.r.rm_owner = owner;

		cur->bc_rec.r.rm_offset = offset;

		cur->bc_rec.r.rm_flags = flags;

		trace_xfs_rmap_insert(mp, cur->bc_ag.pag->pag_agno, bno, len,

			owner, offset, flags);

		trace_xfs_rmap_insert(cur, bno, len, owner, offset, flags);

		error = xfs_btree_insert(cur, &i);

		if (error)

			goto out_error;
@@ -1140,8 +1121,7 @@ xfs_rmap_map( 
		}

	}



	trace_xfs_rmap_map_done(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_map_done(cur, bno, len, unwritten, oinfo);

out_error:

	if (error)

		trace_xfs_rmap_map_error(cur, error, _RET_IP_);
@@ -1218,8 +1198,7 @@ xfs_rmap_convert( 
			(flags & (XFS_RMAP_ATTR_FORK | XFS_RMAP_BMBT_BLOCK))));

	oldext = unwritten ? XFS_RMAP_UNWRITTEN : 0;

	new_endoff = offset + len;

	trace_xfs_rmap_convert(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_convert(cur, bno, len, unwritten, oinfo);



	/*

	 * For the initial lookup, look for an exact match or the left-adjacent
@@ -1235,10 +1214,9 @@ xfs_rmap_convert( 
		goto done;

	}



	trace_xfs_rmap_lookup_le_range_result(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, PREV.rm_startblock,

			PREV.rm_blockcount, PREV.rm_owner,

			PREV.rm_offset, PREV.rm_flags);

	trace_xfs_rmap_lookup_le_range_result(cur, PREV.rm_startblock,

			PREV.rm_blockcount, PREV.rm_owner, PREV.rm_offset,

			PREV.rm_flags);



	ASSERT(PREV.rm_offset <= offset);

	ASSERT(PREV.rm_offset + PREV.rm_blockcount >= new_endoff);
@@ -1279,10 +1257,9 @@ xfs_rmap_convert( 
			error = -EFSCORRUPTED;

			goto done;

		}

		trace_xfs_rmap_find_left_neighbor_result(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, LEFT.rm_startblock,

				LEFT.rm_blockcount, LEFT.rm_owner,

				LEFT.rm_offset, LEFT.rm_flags);

		trace_xfs_rmap_find_left_neighbor_result(cur,

				LEFT.rm_startblock, LEFT.rm_blockcount,

				LEFT.rm_owner, LEFT.rm_offset, LEFT.rm_flags);

		if (LEFT.rm_startblock + LEFT.rm_blockcount == bno &&

		    LEFT.rm_offset + LEFT.rm_blockcount == offset &&

		    xfs_rmap_is_mergeable(&LEFT, owner, newext))
@@ -1320,10 +1297,10 @@ xfs_rmap_convert( 
			error = -EFSCORRUPTED;

			goto done;

		}

		trace_xfs_rmap_find_right_neighbor_result(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, RIGHT.rm_startblock,

				RIGHT.rm_blockcount, RIGHT.rm_owner,

				RIGHT.rm_offset, RIGHT.rm_flags);

		trace_xfs_rmap_find_right_neighbor_result(cur,

				RIGHT.rm_startblock, RIGHT.rm_blockcount,

				RIGHT.rm_owner, RIGHT.rm_offset,

				RIGHT.rm_flags);

		if (bno + len == RIGHT.rm_startblock &&

		    offset + len == RIGHT.rm_offset &&

		    xfs_rmap_is_mergeable(&RIGHT, owner, newext))
@@ -1370,10 +1347,9 @@ xfs_rmap_convert( 
			error = -EFSCORRUPTED;

			goto done;

		}

		trace_xfs_rmap_delete(mp, cur->bc_ag.pag->pag_agno,

				RIGHT.rm_startblock, RIGHT.rm_blockcount,

				RIGHT.rm_owner, RIGHT.rm_offset,

				RIGHT.rm_flags);

		trace_xfs_rmap_delete(cur, RIGHT.rm_startblock,

				RIGHT.rm_blockcount, RIGHT.rm_owner,

				RIGHT.rm_offset, RIGHT.rm_flags);

		error = xfs_btree_delete(cur, &i);

		if (error)

			goto done;
@@ -1390,10 +1366,9 @@ xfs_rmap_convert( 
			error = -EFSCORRUPTED;

			goto done;

		}

		trace_xfs_rmap_delete(mp, cur->bc_ag.pag->pag_agno,

				PREV.rm_startblock, PREV.rm_blockcount,

				PREV.rm_owner, PREV.rm_offset,

				PREV.rm_flags);

		trace_xfs_rmap_delete(cur, PREV.rm_startblock,

				PREV.rm_blockcount, PREV.rm_owner,

				PREV.rm_offset, PREV.rm_flags);

		error = xfs_btree_delete(cur, &i);

		if (error)

			goto done;
@@ -1422,10 +1397,9 @@ xfs_rmap_convert( 
		 * Setting all of a previous oldext extent to newext.

		 * The left neighbor is contiguous, the right is not.

		 */

		trace_xfs_rmap_delete(mp, cur->bc_ag.pag->pag_agno,

				PREV.rm_startblock, PREV.rm_blockcount,

				PREV.rm_owner, PREV.rm_offset,

				PREV.rm_flags);

		trace_xfs_rmap_delete(cur, PREV.rm_startblock,

				PREV.rm_blockcount, PREV.rm_owner,

				PREV.rm_offset, PREV.rm_flags);

		error = xfs_btree_delete(cur, &i);

		if (error)

			goto done;
@@ -1462,10 +1436,9 @@ xfs_rmap_convert( 
			error = -EFSCORRUPTED;

			goto done;

		}

		trace_xfs_rmap_delete(mp, cur->bc_ag.pag->pag_agno,

				RIGHT.rm_startblock, RIGHT.rm_blockcount,

				RIGHT.rm_owner, RIGHT.rm_offset,

				RIGHT.rm_flags);

		trace_xfs_rmap_delete(cur, RIGHT.rm_startblock,

				RIGHT.rm_blockcount, RIGHT.rm_owner,

				RIGHT.rm_offset, RIGHT.rm_flags);

		error = xfs_btree_delete(cur, &i);

		if (error)

			goto done;
@@ -1543,8 +1516,7 @@ xfs_rmap_convert( 
		NEW.rm_blockcount = len;

		NEW.rm_flags = newext;

		cur->bc_rec.r = NEW;

		trace_xfs_rmap_insert(mp, cur->bc_ag.pag->pag_agno, bno,

				len, owner, offset, newext);

		trace_xfs_rmap_insert(cur, bno, len, owner, offset, newext);

		error = xfs_btree_insert(cur, &i);

		if (error)

			goto done;
@@ -1602,8 +1574,7 @@ xfs_rmap_convert( 
		NEW.rm_blockcount = len;

		NEW.rm_flags = newext;

		cur->bc_rec.r = NEW;

		trace_xfs_rmap_insert(mp, cur->bc_ag.pag->pag_agno, bno,

				len, owner, offset, newext);

		trace_xfs_rmap_insert(cur, bno, len, owner, offset, newext);

		error = xfs_btree_insert(cur, &i);

		if (error)

			goto done;
@@ -1634,9 +1605,8 @@ xfs_rmap_convert( 
		NEW = PREV;

		NEW.rm_blockcount = offset - PREV.rm_offset;

		cur->bc_rec.r = NEW;

		trace_xfs_rmap_insert(mp, cur->bc_ag.pag->pag_agno,

				NEW.rm_startblock, NEW.rm_blockcount,

				NEW.rm_owner, NEW.rm_offset,

		trace_xfs_rmap_insert(cur, NEW.rm_startblock,

				NEW.rm_blockcount, NEW.rm_owner, NEW.rm_offset,

				NEW.rm_flags);

		error = xfs_btree_insert(cur, &i);

		if (error)
@@ -1663,8 +1633,7 @@ xfs_rmap_convert( 
		/* new middle extent - newext */

		cur->bc_rec.r.rm_flags &= ~XFS_RMAP_UNWRITTEN;

		cur->bc_rec.r.rm_flags |= newext;

		trace_xfs_rmap_insert(mp, cur->bc_ag.pag->pag_agno, bno, len,

				owner, offset, newext);

		trace_xfs_rmap_insert(cur, bno, len, owner, offset, newext);

		error = xfs_btree_insert(cur, &i);

		if (error)

			goto done;
@@ -1688,8 +1657,7 @@ xfs_rmap_convert( 
		ASSERT(0);

	}



	trace_xfs_rmap_convert_done(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_convert_done(cur, bno, len, unwritten, oinfo);

done:

	if (error)

		trace_xfs_rmap_convert_error(cur, error, _RET_IP_);
@@ -1728,8 +1696,7 @@ xfs_rmap_convert_shared( 
			(flags & (XFS_RMAP_ATTR_FORK | XFS_RMAP_BMBT_BLOCK))));

	oldext = unwritten ? XFS_RMAP_UNWRITTEN : 0;

	new_endoff = offset + len;

	trace_xfs_rmap_convert(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_convert(cur, bno, len, unwritten, oinfo);



	/*

	 * For the initial lookup, look for and exact match or the left-adjacent
@@ -1798,10 +1765,10 @@ xfs_rmap_convert_shared( 
			error = -EFSCORRUPTED;

			goto done;

		}

		trace_xfs_rmap_find_right_neighbor_result(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, RIGHT.rm_startblock,

				RIGHT.rm_blockcount, RIGHT.rm_owner,

				RIGHT.rm_offset, RIGHT.rm_flags);

		trace_xfs_rmap_find_right_neighbor_result(cur,

				RIGHT.rm_startblock, RIGHT.rm_blockcount,

				RIGHT.rm_owner, RIGHT.rm_offset,

				RIGHT.rm_flags);

		if (xfs_rmap_is_mergeable(&RIGHT, owner, newext))

			state |= RMAP_RIGHT_CONTIG;

	}
@@ -2113,8 +2080,7 @@ xfs_rmap_convert_shared( 
		ASSERT(0);

	}



	trace_xfs_rmap_convert_done(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_convert_done(cur, bno, len, unwritten, oinfo);

done:

	if (error)

		trace_xfs_rmap_convert_error(cur, error, _RET_IP_);
@@ -2155,8 +2121,7 @@ xfs_rmap_unmap_shared( 
	xfs_owner_info_unpack(oinfo, &owner, &offset, &flags);

	if (unwritten)

		flags |= XFS_RMAP_UNWRITTEN;

	trace_xfs_rmap_unmap(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_unmap(cur, bno, len, unwritten, oinfo);



	/*

	 * We should always have a left record because there's a static record
@@ -2312,8 +2277,7 @@ xfs_rmap_unmap_shared( 
			goto out_error;

	}



	trace_xfs_rmap_unmap_done(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_unmap_done(cur, bno, len, unwritten, oinfo);

out_error:

	if (error)

		trace_xfs_rmap_unmap_error(cur, error, _RET_IP_);
@@ -2351,8 +2315,7 @@ xfs_rmap_map_shared( 
	xfs_owner_info_unpack(oinfo, &owner, &offset, &flags);

	if (unwritten)

		flags |= XFS_RMAP_UNWRITTEN;

	trace_xfs_rmap_map(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_map(cur, bno, len, unwritten, oinfo);



	/* Is there a left record that abuts our range? */

	error = xfs_rmap_find_left_neighbor(cur, bno, owner, offset, flags,
@@ -2377,10 +2340,10 @@ xfs_rmap_map_shared( 
			error = -EFSCORRUPTED;

			goto out_error;

		}

		trace_xfs_rmap_find_right_neighbor_result(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, gtrec.rm_startblock,

			gtrec.rm_blockcount, gtrec.rm_owner,

			gtrec.rm_offset, gtrec.rm_flags);

		trace_xfs_rmap_find_right_neighbor_result(cur,

				gtrec.rm_startblock, gtrec.rm_blockcount,

				gtrec.rm_owner, gtrec.rm_offset,

				gtrec.rm_flags);



		if (!xfs_rmap_is_mergeable(&gtrec, owner, flags))

			have_gt = 0;
@@ -2472,8 +2435,7 @@ xfs_rmap_map_shared( 
			goto out_error;

	}



	trace_xfs_rmap_map_done(mp, cur->bc_ag.pag->pag_agno, bno, len,

			unwritten, oinfo);

	trace_xfs_rmap_map_done(cur, bno, len, unwritten, oinfo);

out_error:

	if (error)

		trace_xfs_rmap_map_error(cur, error, _RET_IP_);

fs/xfs/xfs_trace.h

+12 −12
Original line number Diff line number Diff line
@@ -2786,10 +2786,10 @@ DEFINE_DEFER_PENDING_ITEM_EVENT(xfs_defer_finish_item); 


/* rmap tracepoints */

DECLARE_EVENT_CLASS(xfs_rmap_class,

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,

	TP_PROTO(struct xfs_btree_cur *cur,

		 xfs_agblock_t agbno, xfs_extlen_t len, bool unwritten,

		 const struct xfs_owner_info *oinfo),

	TP_ARGS(mp, agno, agbno, len, unwritten, oinfo),

	TP_ARGS(cur, agbno, len, unwritten, oinfo),

	TP_STRUCT__entry(

		__field(dev_t, dev)

		__field(xfs_agnumber_t, agno)
@@ -2800,8 +2800,8 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, 
		__field(unsigned long, flags)

	),

	TP_fast_assign(

		__entry->dev = mp->m_super->s_dev;

		__entry->agno = agno;

		__entry->dev = cur->bc_mp->m_super->s_dev;

		__entry->agno = cur->bc_ag.pag->pag_agno;

		__entry->agbno = agbno;

		__entry->len = len;

		__entry->owner = oinfo->oi_owner;
@@ -2821,10 +2821,10 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, 
);

#define DEFINE_RMAP_EVENT(name) \

DEFINE_EVENT(xfs_rmap_class, name, \

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, \

	TP_PROTO(struct xfs_btree_cur *cur, \

		 xfs_agblock_t agbno, xfs_extlen_t len, bool unwritten, \

		 const struct xfs_owner_info *oinfo), \

	TP_ARGS(mp, agno, agbno, len, unwritten, oinfo))

	TP_ARGS(cur, agbno, len, unwritten, oinfo))



/* btree cursor error/%ip tracepoint class */

DECLARE_EVENT_CLASS(xfs_btree_error_class,
@@ -2920,10 +2920,10 @@ TRACE_EVENT(xfs_rmap_convert_state, 
);



DECLARE_EVENT_CLASS(xfs_rmapbt_class,

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,

	TP_PROTO(struct xfs_btree_cur *cur,

		 xfs_agblock_t agbno, xfs_extlen_t len,

		 uint64_t owner, uint64_t offset, unsigned int flags),

	TP_ARGS(mp, agno, agbno, len, owner, offset, flags),

	TP_ARGS(cur, agbno, len, owner, offset, flags),

	TP_STRUCT__entry(

		__field(dev_t, dev)

		__field(xfs_agnumber_t, agno)
@@ -2934,8 +2934,8 @@ DECLARE_EVENT_CLASS(xfs_rmapbt_class, 
		__field(unsigned int, flags)

	),

	TP_fast_assign(

		__entry->dev = mp->m_super->s_dev;

		__entry->agno = agno;

		__entry->dev = cur->bc_mp->m_super->s_dev;

		__entry->agno = cur->bc_ag.pag->pag_agno;

		__entry->agbno = agbno;

		__entry->len = len;

		__entry->owner = owner;
@@ -2953,10 +2953,10 @@ DECLARE_EVENT_CLASS(xfs_rmapbt_class, 
);

#define DEFINE_RMAPBT_EVENT(name) \

DEFINE_EVENT(xfs_rmapbt_class, name, \

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, \

	TP_PROTO(struct xfs_btree_cur *cur, \

		 xfs_agblock_t agbno, xfs_extlen_t len, \

		 uint64_t owner, uint64_t offset, unsigned int flags), \

	TP_ARGS(mp, agno, agbno, len, owner, offset, flags))

	TP_ARGS(cur, agbno, len, owner, offset, flags))



DECLARE_EVENT_CLASS(xfs_rmap_deferred_class,

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,