Move the XFS_SB_MAGIC definition to magic.h. Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> --- fs/xfs/libxfs/xfs_format.h | 3 ++- include/uapi/linux/magic.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h index 1acb584fc5f7..05f7d83e5f88 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h @@ -18,6 +18,8 @@ #ifndef __XFS_FORMAT_H__ #define __XFS_FORMAT_H__ +#include <linux/magic.h> + /* * XFS On Disk Format Definitions * @@ -38,7 +40,6 @@ struct xfs_ifork; * Fits into a sector-sized buffer at address 0 of each allocation group. * Only the first of these is ever updated except during growfs. */ -#define XFS_SB_MAGIC 0x58465342 /* 'XFSB' */ #define XFS_SB_VERSION_1 1 /* 5.3, 6.0.1, 6.1 */ #define XFS_SB_VERSION_2 2 /* 6.2 - attributes */ #define XFS_SB_VERSION_3 3 /* 6.2 - new inode version */ diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 1a6fee974116..f6a641826e79 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -67,6 +67,7 @@ #define TRACEFS_MAGIC 0x74726163 #define V9FS_MAGIC 0x01021997 +#define XFS_SB_MAGIC 0x58465342 #define BDEVFS_MAGIC 0x62646576 #define DAXFS_MAGIC 0x64646178 -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
