xfs: move XFS_INODE_FORMAT_STR mappings to libxfs

Source kernel commit: 0357d21a6c9be2870904598b4767c7d424524849

Move XFS_INODE_FORMAT_STR to libxfs so that we don't forget to keep it
updated, and add necessary TRACE_DEFINE_ENUM.

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

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index f56b244644fdd7f5b8f1d60c7708bcd20b4f115c..23eca3bb77e217440386133a1d03f6f509f4b031 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -916,6 +916,9 @@ static inline uint xfs_dinode_size(int version)
 
 /*
  * Values for di_format
+ *
+ * This enum is used in string mapping in xfs_trace.h; please keep the
+ * TRACE_DEFINE_ENUMs for it up to date.
  */
 typedef enum xfs_dinode_fmt {
        XFS_DINODE_FMT_DEV,             /* xfs_dev_t */
@@ -925,6 +928,13 @@ typedef enum xfs_dinode_fmt {
        XFS_DINODE_FMT_UUID             /* added long ago, but never used */
 } xfs_dinode_fmt_t;
 
+#define XFS_INODE_FORMAT_STR \
+       { XFS_DINODE_FMT_DEV,           "dev" }, \
+       { XFS_DINODE_FMT_LOCAL,         "local" }, \
+       { XFS_DINODE_FMT_EXTENTS,       "extent" }, \
+       { XFS_DINODE_FMT_BTREE,         "btree" }, \
+       { XFS_DINODE_FMT_UUID,          "uuid" }
+
 /*
  * Inode minimum and maximum sizes.
  */