xfs: move XFS_AG_BTREE_CMP_FORMAT_STR mappings to libxfs

Move XFS_AG_BTREE_CMP_FORMAT_STR to libxfs so that we don't forget to
keep it updated, and TRACE_DEFINE_ENUM the values while we're at it.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
index 9a6541872ec10129b0ab25b0522c1e9fea09d04a..6da6ce7ab5d282a8557144b23585284966ba42a8 100644 (file)
--- a/fs/xfs/libxfs/xfs_types.h
+++ b/fs/xfs/libxfs/xfs_types.h
@@ -108,6 +108,11 @@ typedef enum {
        XFS_LOOKUP_EQi, XFS_LOOKUP_LEi, XFS_LOOKUP_GEi
 } xfs_lookup_t;
 
+#define XFS_AG_BTREE_CMP_FORMAT_STR \
+       { XFS_LOOKUP_EQi,       "eq" }, \
+       { XFS_LOOKUP_LEi,       "le" }, \
+       { XFS_LOOKUP_GEi,       "ge" }
+
 typedef enum {
        XFS_BTNUM_BNOi, XFS_BTNUM_CNTi, XFS_BTNUM_RMAPi, XFS_BTNUM_BMAPi,
        XFS_BTNUM_INOi, XFS_BTNUM_FINOi, XFS_BTNUM_REFCi, XFS_BTNUM_MAX

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index deac0b3e64c242b4b4100b79927f48c80b3c051c..3f57002ca66029d31cfcbbfda08a42f9031423ec 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -2629,10 +2629,6 @@ DEFINE_AG_ERROR_EVENT(xfs_ag_resv_init_error);
 TRACE_DEFINE_ENUM(XFS_LOOKUP_EQi);
 TRACE_DEFINE_ENUM(XFS_LOOKUP_LEi);
 TRACE_DEFINE_ENUM(XFS_LOOKUP_GEi);
-#define XFS_AG_BTREE_CMP_FORMAT_STR \
-       { XFS_LOOKUP_EQ,        "eq" }, \
-       { XFS_LOOKUP_LE,        "le" }, \
-       { XFS_LOOKUP_GE,        "ge" }
 DECLARE_EVENT_CLASS(xfs_ag_btree_lookup_class,
        TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,
                 xfs_agblock_t agbno, xfs_lookup_t dir),