From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karel Zak Subject: [PATCH 17/22] ocfs2: move OCFS2_SUPER_MAGIC to Date: Tue, 4 Mar 2014 11:00:53 +0100 Message-ID: <1393927258-10709-18-git-send-email-kzak@redhat.com> References: <1393927258-10709-1-git-send-email-kzak@redhat.com> Cc: linux-fsdevel@vger.kernel.org, Karel Zak , Mark Fasheh To: Al Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:46526 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756869AbaCDKCP (ORCPT ); Tue, 4 Mar 2014 05:02:15 -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. CC: Mark Fasheh Signed-off-by: Karel Zak --- fs/ocfs2/ocfs2_fs.h | 5 ++--- include/uapi/linux/magic.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 938387a..aee3897 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -25,6 +25,8 @@ #ifndef _OCFS2_FS_H #define _OCFS2_FS_H +#include + /* Version */ #define OCFS2_MAJOR_REV_LEVEL 0 #define OCFS2_MINOR_REV_LEVEL 90 @@ -56,9 +58,6 @@ #define OCFS2_MIN_BLOCKSIZE 512 #define OCFS2_MAX_BLOCKSIZE OCFS2_MIN_CLUSTERSIZE -/* Filesystem magic number */ -#define OCFS2_SUPER_MAGIC 0x7461636f - /* Object signatures */ #define OCFS2_SUPER_BLOCK_SIGNATURE "OCFSV2" #define OCFS2_INODE_SIGNATURE "INODE01" diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 974e47e..99c6548 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -15,6 +15,7 @@ #define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */ #define DEBUGFS_MAGIC 0x64626720 #define GFS2_MAGIC 0x01161970 +#define OCFS2_SUPER_MAGIC 0x7461636f #define MQUEUE_MAGIC 0x19800202 #define SECURITYFS_MAGIC 0x73636673 #define SELINUX_MAGIC 0xf97cff8c -- 1.8.5.3