From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-xfs <linux-xfs@vger.kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Subject: [PATCH] xfs: include the XFS magic number in magic.h
Date: Tue, 12 Dec 2017 09:21:09 -0500 [thread overview]
Message-ID: <1513088469.3476.48.camel@linux.vnet.ibm.com> (raw)
Move the XFS_SB_MAGIC definition to magic.h.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
---
fs/xfs/libxfs/xfs_format.h | 3 ++-
include/uapi/linux/magic.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 1acb584fc5f7..05f7d83e5f88 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -18,6 +18,8 @@
#ifndef __XFS_FORMAT_H__
#define __XFS_FORMAT_H__
+#include <linux/magic.h>
+
/*
* XFS On Disk Format Definitions
*
@@ -38,7 +40,6 @@ struct xfs_ifork;
* Fits into a sector-sized buffer at address 0 of each allocation group.
* Only the first of these is ever updated except during growfs.
*/
-#define XFS_SB_MAGIC 0x58465342 /* 'XFSB' */
#define XFS_SB_VERSION_1 1 /* 5.3, 6.0.1, 6.1 */
#define XFS_SB_VERSION_2 2 /* 6.2 - attributes */
#define XFS_SB_VERSION_3 3 /* 6.2 - new inode version */
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 1a6fee974116..f6a641826e79 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -67,6 +67,7 @@
#define TRACEFS_MAGIC 0x74726163
#define V9FS_MAGIC 0x01021997
+#define XFS_SB_MAGIC 0x58465342
#define BDEVFS_MAGIC 0x62646576
#define DAXFS_MAGIC 0x64646178
--
2.7.4
next reply other threads:[~2017-12-12 14:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-12 14:21 Mimi Zohar [this message]
2017-12-12 14:26 ` [PATCH] xfs: include the XFS magic number in magic.h Christoph Hellwig
2017-12-12 14:34 ` Mimi Zohar
2017-12-12 14:36 ` Christoph Hellwig
2017-12-12 15:04 ` Mimi Zohar
2017-12-12 23:30 ` Dave Chinner
2017-12-12 23:55 ` Mimi Zohar
2017-12-13 0:13 ` Dave Chinner
2017-12-13 1:21 ` Mimi Zohar
2017-12-13 2:59 ` Dave Chinner
2017-12-13 8:43 ` Christoph Hellwig
2017-12-13 14:04 ` Mimi Zohar
2017-12-12 21:13 ` Dave Chinner
2017-12-12 23:35 ` Mimi Zohar
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=1513088469.3476.48.camel@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
/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