Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754230Ab0BCGCo (ORCPT ); Wed, 3 Feb 2010 01:02:44 -0500 Received: from rcsinet12.oracle.com ([148.87.113.124]:51017 "EHLO rcsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753116Ab0BCGCm (ORCPT ); Wed, 3 Feb 2010 01:02:42 -0500 From: Tao Ma To: linux-kernel@vger.kernel.org Cc: Tao Ma , Joel Becker , ocfs2-devel@oss.oracle.com Subject: [PATCH] ocfs2: move OCFS2_SUPER_MAGIC to include/linux/magic.h Date: Wed, 3 Feb 2010 14:01:00 +0800 Message-Id: <1265176860-24630-1-git-send-email-tao.ma@oracle.com> X-Mailer: git-send-email 1.6.3.3 X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090208.4B691180.00F6:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1795 Lines: 57 move OCFS2_SUPER_MAGIC to include/linux/magic.h Signed-off-by: Tao Ma Cc: Joel Becker Cc: ocfs2-devel@oss.oracle.com --- fs/ocfs2/ocfs2_fs.h | 3 --- fs/ocfs2/super.c | 1 + include/linux/magic.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 1a1a679..c3cab28 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -56,9 +56,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/fs/ocfs2/super.c b/fs/ocfs2/super.c index 2606991..8d72e12 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -42,6 +42,7 @@ #include #include #include +#include #define MLOG_MASK_PREFIX ML_SUPER #include diff --git a/include/linux/magic.h b/include/linux/magic.h index 76285e0..e27b13c 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -36,6 +36,7 @@ #define MSDOS_SUPER_MAGIC 0x4d44 /* MD */ #define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */ #define NFS_SUPER_MAGIC 0x6969 +#define OCFS2_SUPER_MAGIC 0x7461636f #define OPENPROM_SUPER_MAGIC 0x9fa1 #define PROC_SUPER_MAGIC 0x9fa0 #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ -- 1.5.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/