Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd5eea42 authored by Andrey Mirkin's avatar Andrey Mirkin Committed by Linus Torvalds
Browse files

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: default avatarAndrey Mirkin <major@openvz.org>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4f9a58d7

fs/inotify_user.c

+3 −1
Original line number Diff line number Diff line
@@ -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 = {

include/linux/magic.h

+3 −0
Original line number Diff line number Diff line
@@ -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__ */

kernel/futex.c

+2 −1
Original line number Diff line number Diff line
@@ -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 = {