xfs: move _irec structs to xfs_types.h

Structure definitions for incore objects do not belong in the ondisk
format header.  Move them to the incore types header where they belong.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index b55bdfa9c8a8cd13455f775e49d2daaea23c5293..005dd65b71cd6347835f2a3554e7431af28f790b 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -1564,20 +1564,6 @@ struct xfs_rmap_rec {
 #define RMAPBT_UNUSED_OFFSET_BITLEN    7
 #define RMAPBT_OFFSET_BITLEN           54
 
-#define XFS_RMAP_ATTR_FORK             (1 << 0)
-#define XFS_RMAP_BMBT_BLOCK            (1 << 1)
-#define XFS_RMAP_UNWRITTEN             (1 << 2)
-#define XFS_RMAP_KEY_FLAGS             (XFS_RMAP_ATTR_FORK | \
-                                        XFS_RMAP_BMBT_BLOCK)
-#define XFS_RMAP_REC_FLAGS             (XFS_RMAP_UNWRITTEN)
-struct xfs_rmap_irec {
-       xfs_agblock_t   rm_startblock;  /* extent start block */
-       xfs_extlen_t    rm_blockcount;  /* extent length */
-       uint64_t        rm_owner;       /* extent owner */
-       uint64_t        rm_offset;      /* offset within the owner */
-       unsigned int    rm_flags;       /* state flags */
-};
-
 /*
  * Key structure
  *
@@ -1640,12 +1626,6 @@ struct xfs_refcount_key {
        __be32          rc_startblock;  /* starting block number */
 };
 
-struct xfs_refcount_irec {
-       xfs_agblock_t   rc_startblock;  /* starting block number */
-       xfs_extlen_t    rc_blockcount;  /* count of free blocks */
-       xfs_nlink_t     rc_refcount;    /* number of inodes linked here */
-};
-
 #define MAXREFCOUNT    ((xfs_nlink_t)~0U)
 #define MAXREFCEXTLEN  ((xfs_extlen_t)~0U)
 

diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
index a6b7d98cf68faaac5d66a6daa44d120db4f9ef63..2d9ebc7338b110e0c3438508a65c1bbe1a175158 100644 (file)
--- a/fs/xfs/libxfs/xfs_types.h
+++ b/fs/xfs/libxfs/xfs_types.h
@@ -166,6 +166,26 @@ typedef struct xfs_bmbt_irec
        xfs_exntst_t    br_state;       /* extent state */
 } xfs_bmbt_irec_t;
 
+struct xfs_refcount_irec {
+       xfs_agblock_t   rc_startblock;  /* starting block number */
+       xfs_extlen_t    rc_blockcount;  /* count of free blocks */
+       xfs_nlink_t     rc_refcount;    /* number of inodes linked here */
+};
+
+#define XFS_RMAP_ATTR_FORK             (1 << 0)
+#define XFS_RMAP_BMBT_BLOCK            (1 << 1)
+#define XFS_RMAP_UNWRITTEN             (1 << 2)
+#define XFS_RMAP_KEY_FLAGS             (XFS_RMAP_ATTR_FORK | \
+                                        XFS_RMAP_BMBT_BLOCK)
+#define XFS_RMAP_REC_FLAGS             (XFS_RMAP_UNWRITTEN)
+struct xfs_rmap_irec {
+       xfs_agblock_t   rm_startblock;  /* extent start block */
+       xfs_extlen_t    rm_blockcount;  /* extent length */
+       uint64_t        rm_owner;       /* extent owner */
+       uint64_t        rm_offset;      /* offset within the owner */
+       unsigned int    rm_flags;       /* state flags */
+};
+
 /* per-AG block reservation types */
 enum xfs_ag_resv_type {
        XFS_AG_RESV_NONE = 0,