diff options
| author | Andrey Mirkin <major@openvz.org> | 2007-10-16 23:30:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:43:00 -0700 |
| commit | fd5eea4214f72bd7ac77c1c5346a9c096319131a (patch) | |
| tree | a92c7d1ac79a59777be72fbfdb16d4a410df6de6 | |
| parent | 4f9a58d75bfe82ab2b8ba5b8506dfb190a267834 (diff) | |
change inotifyfs magic as the same magic is used for futexfs
Right now futexfs and inotifyfs have one magic 0xBAD1DEA, that looks a
little bit confusing. Use 0xBAD1DEA as magic for futexfs and 0x2BAD1DEA as
magic for inotifyfs.
Signed-off-by: Andrey Mirkin <major@openvz.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/inotify_user.c | 4 | ||||
| -rw-r--r-- | include/linux/magic.h | 3 | ||||
| -rw-r--r-- | kernel/futex.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/fs/inotify_user.c b/fs/inotify_user.c index 9bf2f6c09df..5e009331c01 100644 --- a/fs/inotify_user.c +++ b/fs/inotify_user.c @@ -31,6 +31,7 @@ #include <linux/list.h> #include <linux/inotify.h> #include <linux/syscalls.h> +#include <linux/magic.h> #include <asm/ioctls.h> @@ -684,7 +685,8 @@ static int inotify_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { - return get_sb_pseudo(fs_type, "inotify", NULL, 0xBAD1DEA, mnt); + return get_sb_pseudo(fs_type, "inotify", NULL, + INOTIFYFS_SUPER_MAGIC, mnt); } static struct file_system_type inotify_fs_type = { diff --git a/include/linux/magic.h b/include/linux/magic.h index 36cc20dfd14..722d4755060 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -38,4 +38,7 @@ #define SMB_SUPER_MAGIC 0x517B #define USBDEVICE_SUPER_MAGIC 0x9fa2 +#define FUTEXFS_SUPER_MAGIC 0xBAD1DEA +#define INOTIFYFS_SUPER_MAGIC 0x2BAD1DEA + #endif /* __LINUX_MAGIC_H__ */ diff --git a/kernel/futex.c b/kernel/futex.c index fcc94e7b408..d725676d84f 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -52,6 +52,7 @@ #include <linux/syscalls.h> #include <linux/signal.h> #include <linux/module.h> +#include <linux/magic.h> #include <asm/futex.h> #include "rtmutex_common.h" @@ -2080,7 +2081,7 @@ static int futexfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { - return get_sb_pseudo(fs_type, "futex", NULL, 0xBAD1DEA, mnt); + return get_sb_pseudo(fs_type, "futex", NULL, FUTEXFS_SUPER_MAGIC, mnt); } static struct file_system_type futex_fs_type = { |