Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c84470dd authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

xfs: remove leftovers of the old btree tracing code 



Remove various bits left over from the old kdb-only btree tracing code, but
leave the actual trace point stubs in place to ease adding new event based
btree tracing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent ea15ab3c

fs/xfs/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ xfs-y += xfs_alloc.o \ 
				   xfs_vnodeops.o \

				   xfs_rw.o



xfs-$(CONFIG_XFS_TRACE)		+= xfs_btree_trace.o



# Objects in linux/

xfs-y				+= $(addprefix $(XFS_LINUX)/, \

				   kmem.o \

fs/xfs/linux-2.6/xfs_super.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_btree.h"

#include "xfs_btree_trace.h"

#include "xfs_ialloc.h"

#include "xfs_bmap.h"

#include "xfs_rtalloc.h"

fs/xfs/xfs_alloc_btree.c

+0 −75
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_btree.h"

#include "xfs_btree_trace.h"

#include "xfs_alloc.h"

#include "xfs_error.h"

#include "xfs_trace.h"
@@ -311,72 +310,6 @@ xfs_allocbt_recs_inorder( 
}

#endif	/* DEBUG */



#ifdef XFS_BTREE_TRACE

ktrace_t	*xfs_allocbt_trace_buf;



STATIC void

xfs_allocbt_trace_enter(

	struct xfs_btree_cur	*cur,

	const char		*func,

	char			*s,

	int			type,

	int			line,

	__psunsigned_t		a0,

	__psunsigned_t		a1,

	__psunsigned_t		a2,

	__psunsigned_t		a3,

	__psunsigned_t		a4,

	__psunsigned_t		a5,

	__psunsigned_t		a6,

	__psunsigned_t		a7,

	__psunsigned_t		a8,

	__psunsigned_t		a9,

	__psunsigned_t		a10)

{

	ktrace_enter(xfs_allocbt_trace_buf, (void *)(__psint_t)type,

		(void *)func, (void *)s, NULL, (void *)cur,

		(void *)a0, (void *)a1, (void *)a2, (void *)a3,

		(void *)a4, (void *)a5, (void *)a6, (void *)a7,

		(void *)a8, (void *)a9, (void *)a10);

}



STATIC void

xfs_allocbt_trace_cursor(

	struct xfs_btree_cur	*cur,

	__uint32_t		*s0,

	__uint64_t		*l0,

	__uint64_t		*l1)

{

	*s0 = cur->bc_private.a.agno;

	*l0 = cur->bc_rec.a.ar_startblock;

	*l1 = cur->bc_rec.a.ar_blockcount;

}



STATIC void

xfs_allocbt_trace_key(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*key,

	__uint64_t		*l0,

	__uint64_t		*l1)

{

	*l0 = be32_to_cpu(key->alloc.ar_startblock);

	*l1 = be32_to_cpu(key->alloc.ar_blockcount);

}



STATIC void

xfs_allocbt_trace_record(

	struct xfs_btree_cur	*cur,

	union xfs_btree_rec	*rec,

	__uint64_t		*l0,

	__uint64_t		*l1,

	__uint64_t		*l2)

{

	*l0 = be32_to_cpu(rec->alloc.ar_startblock);

	*l1 = be32_to_cpu(rec->alloc.ar_blockcount);

	*l2 = 0;

}

#endif /* XFS_BTREE_TRACE */



static const struct xfs_btree_ops xfs_allocbt_ops = {

	.rec_len		= sizeof(xfs_alloc_rec_t),

	.key_len		= sizeof(xfs_alloc_key_t),
@@ -393,18 +326,10 @@ static const struct xfs_btree_ops xfs_allocbt_ops = { 
	.init_rec_from_cur	= xfs_allocbt_init_rec_from_cur,

	.init_ptr_from_cur	= xfs_allocbt_init_ptr_from_cur,

	.key_diff		= xfs_allocbt_key_diff,



#ifdef DEBUG

	.keys_inorder		= xfs_allocbt_keys_inorder,

	.recs_inorder		= xfs_allocbt_recs_inorder,

#endif



#ifdef XFS_BTREE_TRACE

	.trace_enter		= xfs_allocbt_trace_enter,

	.trace_cursor		= xfs_allocbt_trace_cursor,

	.trace_key		= xfs_allocbt_trace_key,

	.trace_record		= xfs_allocbt_trace_record,

#endif

};



/*

fs/xfs/xfs_bmap_btree.c

+0 −98
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "xfs_inode_item.h"

#include "xfs_alloc.h"

#include "xfs_btree.h"

#include "xfs_btree_trace.h"

#include "xfs_itable.h"

#include "xfs_bmap.h"

#include "xfs_error.h"
@@ -732,95 +731,6 @@ xfs_bmbt_recs_inorder( 
}

#endif	/* DEBUG */



#ifdef XFS_BTREE_TRACE

ktrace_t	*xfs_bmbt_trace_buf;



STATIC void

xfs_bmbt_trace_enter(

	struct xfs_btree_cur	*cur,

	const char		*func,

	char			*s,

	int			type,

	int			line,

	__psunsigned_t		a0,

	__psunsigned_t		a1,

	__psunsigned_t		a2,

	__psunsigned_t		a3,

	__psunsigned_t		a4,

	__psunsigned_t		a5,

	__psunsigned_t		a6,

	__psunsigned_t		a7,

	__psunsigned_t		a8,

	__psunsigned_t		a9,

	__psunsigned_t		a10)

{

	struct xfs_inode	*ip = cur->bc_private.b.ip;

	int			whichfork = cur->bc_private.b.whichfork;



	ktrace_enter(xfs_bmbt_trace_buf,

		(void *)((__psint_t)type | (whichfork << 8) | (line << 16)),

		(void *)func, (void *)s, (void *)ip, (void *)cur,

		(void *)a0, (void *)a1, (void *)a2, (void *)a3,

		(void *)a4, (void *)a5, (void *)a6, (void *)a7,

		(void *)a8, (void *)a9, (void *)a10);

}



STATIC void

xfs_bmbt_trace_cursor(

	struct xfs_btree_cur	*cur,

	__uint32_t		*s0,

	__uint64_t		*l0,

	__uint64_t		*l1)

{

	struct xfs_bmbt_rec_host r;



	xfs_bmbt_set_all(&r, &cur->bc_rec.b);



	*s0 = (cur->bc_nlevels << 24) |

	      (cur->bc_private.b.flags << 16) |

	       cur->bc_private.b.allocated;

	*l0 = r.l0;

	*l1 = r.l1;

}



STATIC void

xfs_bmbt_trace_key(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*key,

	__uint64_t		*l0,

	__uint64_t		*l1)

{

	*l0 = be64_to_cpu(key->bmbt.br_startoff);

	*l1 = 0;

}



/* Endian flipping versions of the bmbt extraction functions */

STATIC void

xfs_bmbt_disk_get_all(

	xfs_bmbt_rec_t	*r,

	xfs_bmbt_irec_t *s)

{

	__xfs_bmbt_get_all(get_unaligned_be64(&r->l0),

				get_unaligned_be64(&r->l1), s);

}



STATIC void

xfs_bmbt_trace_record(

	struct xfs_btree_cur	*cur,

	union xfs_btree_rec	*rec,

	__uint64_t		*l0,

	__uint64_t		*l1,

	__uint64_t		*l2)

{

	struct xfs_bmbt_irec	irec;



	xfs_bmbt_disk_get_all(&rec->bmbt, &irec);

	*l0 = irec.br_startoff;

	*l1 = irec.br_startblock;

	*l2 = irec.br_blockcount;

}

#endif /* XFS_BTREE_TRACE */



static const struct xfs_btree_ops xfs_bmbt_ops = {

	.rec_len		= sizeof(xfs_bmbt_rec_t),

	.key_len		= sizeof(xfs_bmbt_key_t),
@@ -837,18 +747,10 @@ static const struct xfs_btree_ops xfs_bmbt_ops = { 
	.init_rec_from_cur	= xfs_bmbt_init_rec_from_cur,

	.init_ptr_from_cur	= xfs_bmbt_init_ptr_from_cur,

	.key_diff		= xfs_bmbt_key_diff,



#ifdef DEBUG

	.keys_inorder		= xfs_bmbt_keys_inorder,

	.recs_inorder		= xfs_bmbt_recs_inorder,

#endif



#ifdef XFS_BTREE_TRACE

	.trace_enter		= xfs_bmbt_trace_enter,

	.trace_cursor		= xfs_bmbt_trace_cursor,

	.trace_key		= xfs_bmbt_trace_key,

	.trace_record		= xfs_bmbt_trace_record,

#endif

};



/*

fs/xfs/xfs_btree.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "xfs_inode.h"

#include "xfs_inode_item.h"

#include "xfs_btree.h"

#include "xfs_btree_trace.h"

#include "xfs_error.h"

#include "xfs_trace.h"