From: Petr Vorel <pvorel@suse.cz>
To: linux-bcachefs@vger.kernel.org
Cc: Petr Vorel <pvorel@suse.cz>,
Kent Overstreet <kent.overstreet@linux.dev>,
Su Yue <l@damenly.org>, Brian Foster <bfoster@redhat.com>,
Coly Li <colyli@suse.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] bcachefs: Move BCACHEFS_STATFS_MAGIC to UAPI magic.h
Date: Tue, 7 May 2024 13:11:24 +0200 [thread overview]
Message-ID: <20240507111124.118520-1-pvorel@suse.cz> (raw)
There are other bcachefs magic definitions: BCACHE_MAGIC, BCHFS_MAGIC,
which use UUID_INIT() and are used only in libbcachefs. Therefore move
to <linux/magic.h> only BCACHEFS_STATFS_MAGIC, which can be used outside
of libbcachefs for f_type field in struct statfs in statfs() or fstatfs().
Keeping non-standard name BCACHEFS_STATFS_MAGIC instead of renaming it
to more generic BCACHEFS_MAGIC to not confuse with the other bcachefs
definitions.
Suggested-by: Su Yue <l@damenly.org>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
fs/bcachefs/bcachefs_format.h | 2 --
fs/bcachefs/fs.c | 1 +
include/uapi/linux/magic.h | 2 ++
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index f7fbfccd2b1e..52e03f13b780 100644
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -1275,8 +1275,6 @@ enum bch_compression_opts {
UUID_INIT(0xc68573f6, 0x66ce, 0x90a9, \
0xd9, 0x6a, 0x60, 0xcf, 0x80, 0x3d, 0xf7, 0xef)
-#define BCACHEFS_STATFS_MAGIC 0xca451a4e
-
#define JSET_MAGIC __cpu_to_le64(0x245235c1a3625032ULL)
#define BSET_MAGIC __cpu_to_le64(0x90135c78b99e07f5ULL)
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index fce690007edf..1c856ae2b0e2 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -27,6 +27,7 @@
#include "super.h"
#include "xattr.h"
+#include <uapi/linux/magic.h>
#include <linux/aio.h>
#include <linux/backing-dev.h>
#include <linux/exportfs.h>
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 1b40a968ba91..45c8f4916167 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -103,4 +103,6 @@
#define SECRETMEM_MAGIC 0x5345434d /* "SECM" */
#define PID_FS_MAGIC 0x50494446 /* "PIDF" */
+#define BCACHEFS_STATFS_MAGIC 0xca451a4e
+
#endif /* __LINUX_MAGIC_H__ */
--
2.43.0
next reply other threads:[~2024-05-07 11:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 11:11 Petr Vorel [this message]
2024-05-07 13:34 ` [PATCH 1/1] bcachefs: Move BCACHEFS_STATFS_MAGIC to UAPI magic.h Brian Foster
2024-05-07 14:43 ` Petr Vorel
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=20240507111124.118520-1-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=bfoster@redhat.com \
--cc=colyli@suse.de \
--cc=kent.overstreet@linux.dev \
--cc=l@damenly.org \
--cc=linux-bcachefs@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).