[PATCH 04/11 linux-next] orangefs: use magic.h

From: Fabian Frederick
Date: Sun May 21 2017 - 11:41:54 EST


Filesystems generally use SUPER_MAGIC values from magic.h
instead of a local definition.

Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
---
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