xfsprogs: get rid of ancient btree tracing fragments

If we are going to do any userspace tracing, it will be via the
existing libxfs tracepoint hooks, not the ancient Irix tracing
macros.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/Makefile b/include/Makefile
index 3031fb5ca3ad4b96bd4f40cd5f6e31879e3ced5e..632b819fcded9104f12de8ef2ee642427dd8427c 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -16,7 +16,6 @@ LIBHFILES = libxfs.h \
        kmem.h \
        list.h \
        parent.h \
-       xfs_btree_trace.h \
        xfs_inode.h \
        xfs_log_recover.h \
        xfs_metadump.h \

diff --git a/include/libxfs.h b/include/libxfs.h
index 2667d3b77084c53faab54179818a6a2dba5c8a30..ad077eaa0f038155dd763299fd39b83decad5359 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -66,7 +66,6 @@ struct iomap;
 #include "xfs_inode_buf.h"
 #include "xfs_alloc.h"
 #include "xfs_btree.h"
-#include "xfs_btree_trace.h"
 #include "xfs_bmap.h"
 #include "xfs_trace.h"
 #include "xfs_trans.h"

diff --git a/include/xfs_btree_trace.h b/include/xfs_btree_trace.h
deleted file mode 100644 (file)
index 72feab6..0000000
--- a/include/xfs_btree_trace.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2008 Silicon Graphics, Inc.
- * All Rights Reserved.
- */
-#ifndef __XFS_BTREE_TRACE_H__
-#define        __XFS_BTREE_TRACE_H__
-
-struct xfs_btree_cur;
-struct xfs_buf;
-
-
-/*
- * Trace hooks.
- * i,j = integer (32 bit)
- * b = btree block buffer (xfs_buf_t)
- * p = btree ptr
- * r = btree record
- * k = btree key
- */
-
-#ifdef XFS_BTREE_TRACE
-
-/*
- * Trace buffer entry types.
- */
-#define XFS_BTREE_KTRACE_ARGBI   1
-#define XFS_BTREE_KTRACE_ARGBII  2
-#define XFS_BTREE_KTRACE_ARGFFFI 3
-#define XFS_BTREE_KTRACE_ARGI    4
-#define XFS_BTREE_KTRACE_ARGIPK  5
-#define XFS_BTREE_KTRACE_ARGIPR  6
-#define XFS_BTREE_KTRACE_ARGIK   7
-#define XFS_BTREE_KTRACE_ARGR   8
-#define XFS_BTREE_KTRACE_CUR     9
-
-/*
- * Sub-types for cursor traces.
- */
-#define XBT_ARGS       0
-#define XBT_ENTRY      1
-#define XBT_ERROR      2
-#define XBT_EXIT       3
-
-void xfs_btree_trace_argbi(const char *, struct xfs_btree_cur *,
-               struct xfs_buf *, int, int);
-void xfs_btree_trace_argbii(const char *, struct xfs_btree_cur *,
-               struct xfs_buf *, int, int, int);
-void xfs_btree_trace_argi(const char *, struct xfs_btree_cur *, int, int);
-void xfs_btree_trace_argipk(const char *, struct xfs_btree_cur *, int,
-               union xfs_btree_ptr, union xfs_btree_key *, int);
-void xfs_btree_trace_argipr(const char *, struct xfs_btree_cur *, int,
-               union xfs_btree_ptr, union xfs_btree_rec *, int);
-void xfs_btree_trace_argik(const char *, struct xfs_btree_cur *, int,
-               union xfs_btree_key *, int);
-void xfs_btree_trace_argr(const char *, struct xfs_btree_cur *,
-               union xfs_btree_rec *, int);
-void xfs_btree_trace_cursor(const char *, struct xfs_btree_cur *, int, int);
-
-#define        XFS_BTREE_TRACE_ARGBI(c, b, i)  \
-       xfs_btree_trace_argbi(__func__, c, b, i, __LINE__)
-#define        XFS_BTREE_TRACE_ARGBII(c, b, i, j)      \
-       xfs_btree_trace_argbii(__func__, c, b, i, j, __LINE__)
-#define        XFS_BTREE_TRACE_ARGI(c, i)      \
-       xfs_btree_trace_argi(__func__, c, i, __LINE__)
-#define        XFS_BTREE_TRACE_ARGIPK(c, i, p, k)      \
-       xfs_btree_trace_argipk(__func__, c, i, p, k, __LINE__)
-#define        XFS_BTREE_TRACE_ARGIPR(c, i, p, r)      \
-       xfs_btree_trace_argipr(__func__, c, i, p, r, __LINE__)
-#define        XFS_BTREE_TRACE_ARGIK(c, i, k)  \
-       xfs_btree_trace_argik(__func__, c, i, k, __LINE__)
-#define XFS_BTREE_TRACE_ARGR(c, r)     \
-       xfs_btree_trace_argr(__func__, c, r, __LINE__)
-#define        XFS_BTREE_TRACE_CURSOR(c, t)    \
-       xfs_btree_trace_cursor(__func__, c, t, __LINE__)
-#else
-#define        XFS_BTREE_TRACE_ARGBI(c, b, i)
-#define        XFS_BTREE_TRACE_ARGBII(c, b, i, j)
-#define        XFS_BTREE_TRACE_ARGI(c, i)
-#define        XFS_BTREE_TRACE_ARGIPK(c, i, p, s)
-#define        XFS_BTREE_TRACE_ARGIPR(c, i, p, r)
-#define        XFS_BTREE_TRACE_ARGIK(c, i, k)
-#define XFS_BTREE_TRACE_ARGR(c, r)
-#define        XFS_BTREE_TRACE_CURSOR(c, t)
-#endif /* XFS_BTREE_TRACE */
-
-#endif /* __XFS_BTREE_TRACE_H__ */