From: Steven Whitehouse <swhiteho@redhat.com>
To: Karel Zak <kzak@redhat.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 11/22] gfs2: move GFS2_MAGIC to <linux/magic.h>
Date: Thu, 06 Mar 2014 10:23:43 +0000 [thread overview]
Message-ID: <1394101423.2729.11.camel@menhir> (raw)
In-Reply-To: <1393927258-10709-12-git-send-email-kzak@redhat.com>
Hi,
On Tue, 2014-03-04 at 11:00 +0100, Karel Zak wrote:
> Move the magic number to proper place.
>
I'm not convinced that it makes sense to move this to a shared header,
outside of gfs2_ondisk.h unless it is needed by some other subsystem or
component. That doesn't appear to be the case here,
Steve.
> CC: Steven Whitehouse <swhiteho@redhat.com>
> Signed-off-by: Karel Zak <kzak@redhat.com>
> ---
> include/uapi/linux/gfs2_ondisk.h | 2 +-
> include/uapi/linux/magic.h | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/gfs2_ondisk.h b/include/uapi/linux/gfs2_ondisk.h
> index 0f24c07..06a05d9 100644
> --- a/include/uapi/linux/gfs2_ondisk.h
> +++ b/include/uapi/linux/gfs2_ondisk.h
> @@ -11,8 +11,8 @@
> #define __GFS2_ONDISK_DOT_H__
>
> #include <linux/types.h>
> +#include <linux/magic.h>
>
> -#define GFS2_MAGIC 0x01161970
> #define GFS2_BASIC_BLOCK 512
> #define GFS2_BASIC_BLOCK_SHIFT 9
>
> diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
> index f8ccce1..14f2a96 100644
> --- a/include/uapi/linux/magic.h
> +++ b/include/uapi/linux/magic.h
> @@ -14,6 +14,7 @@
> #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
> #define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */
> #define DEBUGFS_MAGIC 0x64626720
> +#define GFS2_MAGIC 0x01161970
> #define MQUEUE_MAGIC 0x19800202
> #define SECURITYFS_MAGIC 0x73636673
> #define SELINUX_MAGIC 0xf97cff8c
next prev parent reply other threads:[~2014-03-06 10:24 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 10:00 move all statfs f_type magic numbers to linux/magic.h Karel Zak
2014-03-04 10:00 ` [PATCH 01/22] cifs: move CIFS_MAGIC_NUMBER to <linux/magic.h> Karel Zak
2014-03-04 10:00 ` [PATCH 02/22] xfs: add XFS_SUPER_MAGIC " Karel Zak
2014-03-04 11:10 ` Dave Chinner
2014-03-04 10:00 ` [PATCH 03/22] ipc/mqueue: move MQUEUE_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 04/22] configfs: move CONFIGFS_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 05/22] befs: move BEFS_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 06/22] bfs: move BFS_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 07/22] ceph: move CEPH_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 08/22] exofs: move EXOFS_SUPER_MAGIC " Karel Zak
2014-04-03 8:54 ` Boaz Harrosh
2014-03-04 10:00 ` [PATCH 09/22] freevxfs: move VXFS_SUPER_MAGIC " Karel Zak
2014-03-04 17:26 ` Christoph Hellwig
2014-03-04 10:00 ` [PATCH 10/22] fuse: move FUSE_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 11/22] gfs2: move GFS2_MAGIC " Karel Zak
2014-03-06 10:23 ` Steven Whitehouse [this message]
2014-03-04 10:00 ` [PATCH 12/22] hfsplus: move HFSPLUS_SUPER_MAGIC " Karel Zak
2014-03-04 10:23 ` Vyacheslav Dubeyko
2014-03-04 17:26 ` Christoph Hellwig
2014-03-04 10:00 ` [PATCH 13/22] hppfs: move HPPFS_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 14/22] jfs: move JFS_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 15/22] logfs: add LOGFS_FTYPE_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 16/22] ntfs: move NTFS_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 17/22] ocfs2: move OCFS2_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 18/22] omfs: move OMFS_MAGIC " Karel Zak
2014-03-04 13:51 ` Bob Copeland
2014-03-04 10:00 ` [PATCH 19/22] romfs: move ROMFS_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 20/22] ubifs: move UBIFS_SUPER_MAGIC " Karel Zak
2014-03-04 10:00 ` [PATCH 21/22] udf: move UDF_SUPER_MAGIC " Karel Zak
2014-03-04 11:11 ` Jan Kara
2014-03-04 11:14 ` Jan Kara
2014-03-04 10:00 ` [PATCH 22/22] ufs: move UFS_MAGIC and UFS2_MAGIC " Karel Zak
2014-03-04 10:58 ` move all statfs f_type magic numbers to linux/magic.h Dave Chinner
2014-03-04 12:37 ` Karel Zak
2014-03-05 0:20 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394101423.2729.11.camel@menhir \
--to=swhiteho@redhat.com \
--cc=kzak@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).