From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karel Zak Subject: [PATCH 22/22] ufs: move UFS_MAGIC and UFS2_MAGIC to Date: Tue, 4 Mar 2014 11:00:58 +0100 Message-ID: <1393927258-10709-23-git-send-email-kzak@redhat.com> References: <1393927258-10709-1-git-send-email-kzak@redhat.com> Cc: linux-fsdevel@vger.kernel.org, Karel Zak , Evgeniy Dushistov To: Al Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:22473 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756877AbaCDKCZ (ORCPT ); Tue, 4 Mar 2014 05:02:25 -0500 In-Reply-To: <1393927258-10709-1-git-send-email-kzak@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Move the magic numbers to proper place. CC: Evgeniy Dushistov Signed-off-by: Karel Zak --- 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 #include #include +#include #include 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