From: Fabian Frederick <fabf@skynet.be>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Mike Marshall <hubcap@omnibond.com>,
pvfs2-developers@beowulf-underground.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
fabf@skynet.be
Subject: [PATCH 04/11 linux-next] orangefs: use magic.h
Date: Sun, 21 May 2017 17:41:00 +0200 [thread overview]
Message-ID: <20170521154100.27092-1-fabf@skynet.be> (raw)
Filesystems generally use SUPER_MAGIC values from magic.h
instead of a local definition.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
fs/orangefs/protocol.h | 3 +--
include/uapi/linux/magic.h | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h
index 48bcc1b..a511ac6 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -3,6 +3,7 @@
#include <linux/spinlock_types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
+#include <linux/magic.h>
/* pvfs2-config.h ***********************************************************/
#define ORANGEFS_VERSION_MAJOR 2
@@ -80,8 +81,6 @@ typedef __u64 ORANGEFS_ds_position;
typedef __s32 ORANGEFS_error;
typedef __s64 ORANGEFS_offset;
-#define ORANGEFS_SUPER_MAGIC 0x20030528
-
/*
* ORANGEFS error codes are a signed 32-bit integer. Error codes are negative, but
* the sign is stripped before decoding.
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 507f3c3..a83c48f 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -47,6 +47,7 @@
#define NILFS_SUPER_MAGIC 0x3434
#define NSFS_MAGIC 0x6e736673
#define OPENPROM_SUPER_MAGIC 0x9fa1
+#define ORANGEFS_SUPER_MAGIC 0x20030528
#define OVERLAYFS_SUPER_MAGIC 0x794c7630
#define PIPEFS_MAGIC 0x50495045
#define PROC_SUPER_MAGIC 0x9fa0
--
2.9.3
reply other threads:[~2017-05-21 15:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20170521154100.27092-1-fabf@skynet.be \
--to=fabf@skynet.be \
--cc=hubcap@omnibond.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pvfs2-developers@beowulf-underground.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.