From: James Hogan Date: Wed, 27 Mar 2013 10:47:13 +0000 (+0000) Subject: hostfs: move HOSTFS_SUPER_MAGIC to X-Git-Tag: submit/tizen_common/20140905.094502~2998^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b3b9bb03a9fb1e4c72947cc235771c6455ec7c9;p=sdk%2Femulator%2Femulator-kernel.git hostfs: move HOSTFS_SUPER_MAGIC to Move HOSTFS_SUPER_MAGIC to to be with it's magical friends from other file systems. Reported-by: Al Viro Signed-off-by: James Hogan Signed-off-by: Al Viro --- diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 95b9c87cb24a..f2372ef80850 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -45,8 +46,6 @@ static const struct dentry_operations hostfs_dentry_ops = { static char *root_ino = ""; static int append = 0; -#define HOSTFS_SUPER_MAGIC 0x00c0ffee - static const struct inode_operations hostfs_iops; static const struct inode_operations hostfs_dir_iops; static const struct inode_operations hostfs_link_iops; diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 249df3720be2..2944278a8ba7 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -30,6 +30,7 @@ #define JFFS2_SUPER_MAGIC 0x72b6 #define PSTOREFS_MAGIC 0x6165676C #define EFIVARFS_MAGIC 0xde5e81e4 +#define HOSTFS_SUPER_MAGIC 0x00c0ffee #define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */ #define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */