From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karel Zak Subject: [PATCH 12/22] hfsplus: move HFSPLUS_SUPER_MAGIC to Date: Tue, 4 Mar 2014 11:00:48 +0100 Message-ID: <1393927258-10709-13-git-send-email-kzak@redhat.com> References: <1393927258-10709-1-git-send-email-kzak@redhat.com> Cc: linux-fsdevel@vger.kernel.org, Karel Zak To: Al Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:28165 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756853AbaCDKCB (ORCPT ); Tue, 4 Mar 2014 05:02:01 -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 number to proper place. Signed-off-by: Karel Zak --- fs/hfsplus/hfsplus_raw.h | 2 +- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h index 8ffb3a8..73b2701 100644 --- a/fs/hfsplus/hfsplus_raw.h +++ b/fs/hfsplus/hfsplus_raw.h @@ -14,6 +14,7 @@ #define _LINUX_HFSPLUS_RAW_H #include +#include /* Some constants */ #define HFSPLUS_SECTOR_SIZE 512 @@ -21,7 +22,6 @@ #define HFSPLUS_VOLHEAD_SECTOR 2 #define HFSPLUS_VOLHEAD_SIG 0x482b #define HFSPLUS_VOLHEAD_SIGX 0x4858 -#define HFSPLUS_SUPER_MAGIC 0x482b #define HFSPLUS_MIN_VERSION 4 #define HFSPLUS_CURRENT_VERSION 5 diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 14f2a96..4980428 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -39,6 +39,7 @@ #define JFFS2_SUPER_MAGIC 0x72b6 #define PSTOREFS_MAGIC 0x6165676C #define EFIVARFS_MAGIC 0xde5e81e4 +#define HFSPLUS_SUPER_MAGIC 0x482b #define HOSTFS_SUPER_MAGIC 0x00c0ffee #define VXFS_SUPER_MAGIC 0xa501FCF5 #define XFS_SUPER_MAGIC 0x58465342 -- 1.8.5.3