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 /kernel | |
| parent | 4f9a58d75bfe82ab2b8ba5b8506dfb190a267834 (diff) | |
| download | linux-fd5eea4214f72bd7ac77c1c5346a9c096319131a.tar.bz2 | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index fcc94e7b4086..d725676d84f3 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 = { |