From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 Nov 2017 04:11:35 +0000 (-0600)
Subject: xfs: move xfs_bmbt_irec and xfs_exntst_t to xfs_types.h
X-Git-Tag: v4.15.0-rc1~143^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5837f99a9f30cf83391f546bc3ac287b345027dc;p=thirdparty%2Fxfsprogs-dev.git

xfs: move xfs_bmbt_irec and xfs_exntst_t to xfs_types.h

Source kernel commit: 866d7826c966d0d17cb31eaf394728a163ad7227

Neither defines an on-disk format, so move them out of xfs_format.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index 4ab4f9b70..48548933f 100644
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -1577,24 +1577,6 @@ static inline xfs_filblks_t startblockval(xfs_fsblock_t x)
 	return (xfs_filblks_t)((x) & ~STARTBLOCKMASK);
 }
 
-/*
- * Possible extent states.
- */
-typedef enum {
-	XFS_EXT_NORM, XFS_EXT_UNWRITTEN,
-} xfs_exntst_t;
-
-/*
- * Incore version of above.
- */
-typedef struct xfs_bmbt_irec
-{
-	xfs_fileoff_t	br_startoff;	/* starting file offset */
-	xfs_fsblock_t	br_startblock;	/* starting block number */
-	xfs_filblks_t	br_blockcount;	/* number of blocks */
-	xfs_exntst_t	br_state;	/* extent state */
-} xfs_bmbt_irec_t;
-
 /*
  * Key structure for non-leaf levels of the tree.
  */
diff --git a/libxfs/xfs_types.h b/libxfs/xfs_types.h
index 983878019..3c560695c 100644
--- a/libxfs/xfs_types.h
+++ b/libxfs/xfs_types.h
@@ -147,4 +147,16 @@ struct xfs_iext_cursor {
 	int			pos;
 };
 
+typedef enum {
+	XFS_EXT_NORM, XFS_EXT_UNWRITTEN,
+} xfs_exntst_t;
+
+typedef struct xfs_bmbt_irec
+{
+	xfs_fileoff_t	br_startoff;	/* starting file offset */
+	xfs_fsblock_t	br_startblock;	/* starting block number */
+	xfs_filblks_t	br_blockcount;	/* number of blocks */
+	xfs_exntst_t	br_state;	/* extent state */
+} xfs_bmbt_irec_t;
+
 #endif	/* __XFS_TYPES_H__ */