2007-09-24 08:46:11

by Andrey Mirkin

Subject: [PATCH] change inotifyfs magic as the same magic is used for futexfs (v2)

From: Andrey Mirkin <[email protected]>

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 <[email protected]>

----

fs/inotify_user.c | 4 +++-
include/linux/magic.h | 3 +++
kernel/futex.c | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/inotify_user.c b/fs/inotify_user.c
index 9bf2f6c..5e00933 100644
--- a/fs/inotify_user.c
+++ b/fs/inotify_user.c
@@ -31,6 +31,7 @@ #include <linux/init.h>
#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/futex.h b/include/linux/futex.h
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
diff --git a/include/linux/magic.h b/include/linux/magic.h
index 36cc20d..722d475 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -38,4 +38,7 @@ #define REISER2FS_JR_SUPER_MAGIC_STRING
#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 e8935b1..856dfba 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -52,6 +52,7 @@ #include <linux/pagemap.h>
#include <linux/syscalls.h>
#include <linux/signal.h>
#include <linux/module.h>
+#include <linux/magic.h>
#include <asm/futex.h>

#include "rtmutex_common.h"
@@ -2074,7 +2075,7 @@ static int futexfs_get_sb(struct file_sy
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 = {

2007-09-24 15:09:19

by Randy Dunlap

Subject: Re: [PATCH] change inotifyfs magic as the same magic is used for futexfs (v2)

On Mon, 24 Sep 2007 12:46:06 +0400 Andrey Mirkin wrote:

> From: Andrey Mirkin <[email protected]>
>
> 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 <[email protected]>

Acked-by: Randy Dunlap <[email protected]>

> ----
>
> fs/inotify_user.c | 4 +++-
> include/linux/magic.h | 3 +++
> kernel/futex.c | 3 ++-
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/fs/inotify_user.c b/fs/inotify_user.c
> index 9bf2f6c..5e00933 100644
> --- a/fs/inotify_user.c
> +++ b/fs/inotify_user.c
> @@ -31,6 +31,7 @@ #include <linux/init.h>
> #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/futex.h b/include/linux/futex.h
> diff --git a/include/linux/inotify.h b/include/linux/inotify.h
> diff --git a/include/linux/magic.h b/include/linux/magic.h
> index 36cc20d..722d475 100644
> --- a/include/linux/magic.h
> +++ b/include/linux/magic.h
> @@ -38,4 +38,7 @@ #define REISER2FS_JR_SUPER_MAGIC_STRING
> #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 e8935b1..856dfba 100644
> --- a/kernel/futex.c
> +++ b/kernel/futex.c
> @@ -52,6 +52,7 @@ #include <linux/pagemap.h>
> #include <linux/syscalls.h>
> #include <linux/signal.h>
> #include <linux/module.h>
> +#include <linux/magic.h>
> #include <asm/futex.h>
>
> #include "rtmutex_common.h"
> @@ -2074,7 +2075,7 @@ static int futexfs_get_sb(struct file_sy
> 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 = {
> -

---
~Randy
Phaedrus says that Quality is about caring.