Filesystems generally use SUPER_MAGIC values from magic.h instead of a local definition. Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> --- fs/fuse/control.c | 3 +-- fs/fuse/inode.c | 3 +-- include/uapi/linux/magic.h | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/fuse/control.c b/fs/fuse/control.c index b9ea99c..9015c15 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c @@ -10,8 +10,7 @@ #include <linux/init.h> #include <linux/module.h> - -#define FUSE_CTL_SUPER_MAGIC 0x65735543 +#include <linux/magic.h> /* * This is non-NULL when the single instance of the control filesystem diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 5a1b58f..5362761 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -22,6 +22,7 @@ #include <linux/exportfs.h> #include <linux/posix_acl.h> #include <linux/pid_namespace.h> +#include <linux/magic.h> MODULE_AUTHOR("Miklos Szeredi <miklos@xxxxxxxxxx>"); MODULE_DESCRIPTION("Filesystem in Userspace"); @@ -49,8 +50,6 @@ MODULE_PARM_DESC(max_user_congthresh, "Global limit for the maximum congestion threshold an " "unprivileged user can set"); -#define FUSE_SUPER_MAGIC 0x65735546 - #define FUSE_DEFAULT_BLKSIZE 512 /** Maximum number of outstanding background requests */ diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 2621eaf..6afc4b2 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -29,6 +29,8 @@ #define EXT4_SUPER_MAGIC 0xEF53 #define EXOFS_SUPER_MAGIC 0x5DF5 #define F2FS_SUPER_MAGIC 0xF2F52010 +#define FUSE_CTL_SUPER_MAGIC 0x65735543 +#define FUSE_SUPER_MAGIC 0x65735546 #define FUTEXFS_SUPER_MAGIC 0xBAD1DEA #define HOSTFS_SUPER_MAGIC 0x00c0ffee #define HPFS_SUPER_MAGIC 0xf995e849 -- 2.9.3