aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndrey Mirkin <major@openvz.org>2007-10-17 02:30:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:00 -0400
commitfd5eea4214f72bd7ac77c1c5346a9c096319131a (patch)
treea92c7d1ac79a59777be72fbfdb16d4a410df6de6 /fs
parent4f9a58d75bfe82ab2b8ba5b8506dfb190a267834 (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>
Diffstat (limited to 'fs')
-rw-r--r--fs/inotify_user.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/inotify_user.c b/fs/inotify_user.c
index 9bf2f6c09df6..5e009331c01f 100644
--- a/fs/inotify_user.c
+++ b/fs/inotify_user.c
@@ -31,6 +31,7 @@
31#include <linux/list.h> 31#include <linux/list.h>
32#include <linux/inotify.h> 32#include <linux/inotify.h>
33#include <linux/syscalls.h> 33#include <linux/syscalls.h>
34#include <linux/magic.h>
34 35
35#include <asm/ioctls.h> 36#include <asm/ioctls.h>
36 37
@@ -684,7 +685,8 @@ static int
684inotify_get_sb(struct file_system_type *fs_type, int flags, 685inotify_get_sb(struct file_system_type *fs_type, int flags,
685 const char *dev_name, void *data, struct vfsmount *mnt) 686 const char *dev_name, void *data, struct vfsmount *mnt)
686{ 687{
687 return get_sb_pseudo(fs_type, "inotify", NULL, 0xBAD1DEA, mnt); 688 return get_sb_pseudo(fs_type, "inotify", NULL,
689 INOTIFYFS_SUPER_MAGIC, mnt);
688} 690}
689 691
690static struct file_system_type inotify_fs_type = { 692static struct file_system_type inotify_fs_type = {