Move the magic numbers to proper place. CC: Evgeniy Dushistov <dushistov@xxxxxxx> Signed-off-by: Karel Zak <kzak@xxxxxxxxxx> --- fs/ufs/ufs_fs.h | 5 +++-- include/uapi/linux/magic.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ufs/ufs_fs.h b/fs/ufs/ufs_fs.h index 0cbd5d3..dba15d3 100644 --- a/fs/ufs/ufs_fs.h +++ b/fs/ufs/ufs_fs.h @@ -35,6 +35,7 @@ #include <linux/stat.h> #include <linux/fs.h> #include <linux/workqueue.h> +#include <linux/magic.h> #include <asm/div64.h> typedef __u64 __bitwise __fs64; @@ -48,9 +49,9 @@ typedef __u16 __bitwise __fs16; #define UFS_SECTOR_SIZE 512 #define UFS_SECTOR_BITS 9 -#define UFS_MAGIC 0x00011954 + +/* see linux/magic.h for regular magic numbers */ #define UFS_MAGIC_BW 0x0f242697 -#define UFS2_MAGIC 0x19540119 #define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ /* Copied from FreeBSD */ diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index aae1070..5004e95 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -24,6 +24,8 @@ #define RAMFS_MAGIC 0x858458f6 /* some random number */ #define TMPFS_MAGIC 0x01021994 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ +#define UFS_MAGIC 0x00011954 +#define UFS2_MAGIC 0x19540119 #define ROMFS_MAGIC 0x7275 #define SQUASHFS_MAGIC 0x73717368 #define ECRYPTFS_SUPER_MAGIC 0xf15f -- 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
