xfs: move the XLOG_REG_ constants out of xfs_log_format.h

These are purely in-memory values and not used at all in xfsprogs.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index e5e6f8c0408f78eb217d49c8b9858643cdc27676..da99ab4aea6cf190bc884997cb0a805e82d4e03c 100644 (file)
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -86,43 +86,6 @@ struct xfs_unmount_log_format {
        uint32_t        pad2;   /* may as well make it 64 bits */
 };
 
-/* Region types for iovec's i_type */
-#define XLOG_REG_TYPE_BFORMAT          1
-#define XLOG_REG_TYPE_BCHUNK           2
-#define XLOG_REG_TYPE_EFI_FORMAT       3
-#define XLOG_REG_TYPE_EFD_FORMAT       4
-#define XLOG_REG_TYPE_IFORMAT          5
-#define XLOG_REG_TYPE_ICORE            6
-#define XLOG_REG_TYPE_IEXT             7
-#define XLOG_REG_TYPE_IBROOT           8
-#define XLOG_REG_TYPE_ILOCAL           9
-#define XLOG_REG_TYPE_IATTR_EXT                10
-#define XLOG_REG_TYPE_IATTR_BROOT      11
-#define XLOG_REG_TYPE_IATTR_LOCAL      12
-#define XLOG_REG_TYPE_QFORMAT          13
-#define XLOG_REG_TYPE_DQUOT            14
-#define XLOG_REG_TYPE_QUOTAOFF         15
-#define XLOG_REG_TYPE_LRHEADER         16
-#define XLOG_REG_TYPE_UNMOUNT          17
-#define XLOG_REG_TYPE_COMMIT           18
-#define XLOG_REG_TYPE_TRANSHDR         19
-#define XLOG_REG_TYPE_ICREATE          20
-#define XLOG_REG_TYPE_RUI_FORMAT       21
-#define XLOG_REG_TYPE_RUD_FORMAT       22
-#define XLOG_REG_TYPE_CUI_FORMAT       23
-#define XLOG_REG_TYPE_CUD_FORMAT       24
-#define XLOG_REG_TYPE_BUI_FORMAT       25
-#define XLOG_REG_TYPE_BUD_FORMAT       26
-#define XLOG_REG_TYPE_ATTRI_FORMAT     27
-#define XLOG_REG_TYPE_ATTRD_FORMAT     28
-#define XLOG_REG_TYPE_ATTR_NAME                29
-#define XLOG_REG_TYPE_ATTR_VALUE       30
-#define XLOG_REG_TYPE_XMI_FORMAT       31
-#define XLOG_REG_TYPE_XMD_FORMAT       32
-#define XLOG_REG_TYPE_ATTR_NEWNAME     33
-#define XLOG_REG_TYPE_ATTR_NEWVALUE    34
-#define XLOG_REG_TYPE_MAX              34
-
 /*
  * Flags to log operation header
  *

diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 110f02690f855e8204edc0de8af02790a50fc1d5..c4930e925fed90c7664e7ed5b0a5f80ddb6bc68c 100644 (file)
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -21,6 +21,43 @@ struct xfs_log_vec {
        int                     lv_alloc_size;  /* size of allocated lv */
 };
 
+/* Region types for iovec's i_type */
+#define XLOG_REG_TYPE_BFORMAT          1
+#define XLOG_REG_TYPE_BCHUNK           2
+#define XLOG_REG_TYPE_EFI_FORMAT       3
+#define XLOG_REG_TYPE_EFD_FORMAT       4
+#define XLOG_REG_TYPE_IFORMAT          5
+#define XLOG_REG_TYPE_ICORE            6
+#define XLOG_REG_TYPE_IEXT             7
+#define XLOG_REG_TYPE_IBROOT           8
+#define XLOG_REG_TYPE_ILOCAL           9
+#define XLOG_REG_TYPE_IATTR_EXT                10
+#define XLOG_REG_TYPE_IATTR_BROOT      11
+#define XLOG_REG_TYPE_IATTR_LOCAL      12
+#define XLOG_REG_TYPE_QFORMAT          13
+#define XLOG_REG_TYPE_DQUOT            14
+#define XLOG_REG_TYPE_QUOTAOFF         15
+#define XLOG_REG_TYPE_LRHEADER         16
+#define XLOG_REG_TYPE_UNMOUNT          17
+#define XLOG_REG_TYPE_COMMIT           18
+#define XLOG_REG_TYPE_TRANSHDR         19
+#define XLOG_REG_TYPE_ICREATE          20
+#define XLOG_REG_TYPE_RUI_FORMAT       21
+#define XLOG_REG_TYPE_RUD_FORMAT       22
+#define XLOG_REG_TYPE_CUI_FORMAT       23
+#define XLOG_REG_TYPE_CUD_FORMAT       24
+#define XLOG_REG_TYPE_BUI_FORMAT       25
+#define XLOG_REG_TYPE_BUD_FORMAT       26
+#define XLOG_REG_TYPE_ATTRI_FORMAT     27
+#define XLOG_REG_TYPE_ATTRD_FORMAT     28
+#define XLOG_REG_TYPE_ATTR_NAME                29
+#define XLOG_REG_TYPE_ATTR_VALUE       30
+#define XLOG_REG_TYPE_XMI_FORMAT       31
+#define XLOG_REG_TYPE_XMD_FORMAT       32
+#define XLOG_REG_TYPE_ATTR_NEWNAME     33
+#define XLOG_REG_TYPE_ATTR_NEWVALUE    34
+#define XLOG_REG_TYPE_MAX              34
+
 #define XFS_LOG_VEC_ORDERED    (-1)
 
 /*