Move the magic number to proper place as it's exported by statfs.f_type to userspace. CC: Dave Chinner <david@xxxxxxxxxxxxx> Signed-off-by: Karel Zak <kzak@xxxxxxxxxx> --- fs/xfs/xfs_sb.h | 4 +++- include/uapi/linux/magic.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h index 35061d4..e4c44fa 100644 --- a/fs/xfs/xfs_sb.h +++ b/fs/xfs/xfs_sb.h @@ -18,6 +18,8 @@ #ifndef __XFS_SB_H__ #define __XFS_SB_H__ +#include <linux/magic.h> + /* * Super block * Fits into a sector-sized buffer at address 0 of each allocation group. @@ -28,7 +30,7 @@ struct xfs_buf; struct xfs_mount; struct xfs_trans; -#define XFS_SB_MAGIC 0x58465342 /* 'XFSB' */ +#define XFS_SB_MAGIC XFS_SUPER_MAGIC /* see linux/magic.h */ #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 343ea0c..c9b516dd 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -32,6 +32,7 @@ #define PSTOREFS_MAGIC 0x6165676C #define EFIVARFS_MAGIC 0xde5e81e4 #define HOSTFS_SUPER_MAGIC 0x00c0ffee +#define XFS_SUPER_MAGIC 0x58465342 #define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */ #define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */ -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
