From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karel Zak Subject: [PATCH 05/22] befs: move BEFS_SUPER_MAGIC to Date: Tue, 4 Mar 2014 11:00:41 +0100 Message-ID: <1393927258-10709-6-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]:21756 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756650AbaCDKE3 (ORCPT ); Tue, 4 Mar 2014 05:04:29 -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/befs/befs_fs_types.h | 5 +++-- include/uapi/linux/magic.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/befs/befs_fs_types.h b/fs/befs/befs_fs_types.h index eb557d9..0c422db 100644 --- a/fs/befs/befs_fs_types.h +++ b/fs/befs/befs_fs_types.h @@ -16,8 +16,10 @@ #ifdef __KERNEL__ #include +#include #endif /*__KERNEL__*/ + #define PACKED __attribute__ ((__packed__)) /* @@ -49,7 +51,7 @@ enum super_flags { BEFS_BYTESEX_LE, BEFS_CLEAN = 0x434c454e, BEFS_DIRTY = 0x44495254, - BEFS_SUPER_MAGIC1 = 0x42465331, /* BFS1 */ + BEFS_SUPER_MAGIC1 = BEFS_SUPER_MAGIC /* see linux/magic.h */ BEFS_SUPER_MAGIC2 = 0xdd121031, BEFS_SUPER_MAGIC3 = 0x15b6830e, }; @@ -58,7 +60,6 @@ enum super_flags { #define BEFS_BYTEORDER_NATIVE_LE (__force fs32)cpu_to_le32(BEFS_BYTEORDER_NATIVE) #define BEFS_BYTEORDER_NATIVE_BE (__force fs32)cpu_to_be32(BEFS_BYTEORDER_NATIVE) -#define BEFS_SUPER_MAGIC BEFS_SUPER_MAGIC1 #define BEFS_SUPER_MAGIC1_LE (__force fs32)cpu_to_le32(BEFS_SUPER_MAGIC1) #define BEFS_SUPER_MAGIC1_BE (__force fs32)cpu_to_be32(BEFS_SUPER_MAGIC1) diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 12bac3f..ba3be09 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -5,6 +5,7 @@ #define AFFS_SUPER_MAGIC 0xadff #define AFS_SUPER_MAGIC 0x5346414F #define AUTOFS_SUPER_MAGIC 0x0187 +#define BEFS_SUPER_MAGIC 0x42465331 /* "BFS1" */ #define CIFS_MAGIC_NUMBER 0xff534d42 #define CODA_SUPER_MAGIC 0x73757245 #define CONFIGFS_MAGIC 0x62656570 /* some random number */ -- 1.8.5.3