From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karel Zak Subject: [PATCH 14/22] jfs: move JFS_SUPER_MAGIC to Date: Tue, 4 Mar 2014 11:00:50 +0100 Message-ID: <1393927258-10709-15-git-send-email-kzak@redhat.com> References: <1393927258-10709-1-git-send-email-kzak@redhat.com> Cc: linux-fsdevel@vger.kernel.org, Karel Zak , Dave Kleikamp To: Al Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33252 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756818AbaCDKCF (ORCPT ); Tue, 4 Mar 2014 05:02:05 -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: Dave Kleikamp Signed-off-by: Karel Zak --- fs/jfs/jfs_incore.h | 6 +----- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h index cf47f09..60998dd 100644 --- a/fs/jfs/jfs_incore.h +++ b/fs/jfs/jfs_incore.h @@ -23,16 +23,12 @@ #include #include #include +#include #include "jfs_types.h" #include "jfs_xtree.h" #include "jfs_dtree.h" /* - * JFS magic number - */ -#define JFS_SUPER_MAGIC 0x3153464a /* "JFS1" */ - -/* * JFS-private inode information */ struct jfs_inode_info { diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 641dcea..7898d5d 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -37,6 +37,7 @@ #define HPFS_SUPER_MAGIC 0xf995e849 #define ISOFS_SUPER_MAGIC 0x9660 #define JFFS2_SUPER_MAGIC 0x72b6 +#define JFS_SUPER_MAGIC 0x3153464a /* "JFS1" */ #define PSTOREFS_MAGIC 0x6165676C #define EFIVARFS_MAGIC 0xde5e81e4 #define HFSPLUS_SUPER_MAGIC 0x482b -- 1.8.5.3