]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ramfs: move RAMFS_MAGIC to include/linux/magic.h
authormaximilian attems <max@stro.at>
Tue, 22 Sep 2009 23:45:53 +0000 (16:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 14:39:42 +0000 (07:39 -0700)
initramfs userspace likes to use this magic number.

Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ramfs/inode.c
include/linux/magic.h

index a7f0110fca4c546eb6c4941d513fb0983082560f..a6090aa1a7c138e31fd71eb3b99b8f9c3cbc6ab4 100644 (file)
 #include <linux/ramfs.h>
 #include <linux/sched.h>
 #include <linux/parser.h>
 #include <linux/ramfs.h>
 #include <linux/sched.h>
 #include <linux/parser.h>
+#include <linux/magic.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
 #include <asm/uaccess.h>
 #include "internal.h"
 
-/* some random number */
-#define RAMFS_MAGIC    0x858458f6
-
 #define RAMFS_DEFAULT_MODE     0755
 
 static const struct super_operations ramfs_ops;
 #define RAMFS_DEFAULT_MODE     0755
 
 static const struct super_operations ramfs_ops;
index bce37786a0a57d19b7c8c64a653e13b4a025dacd..76285e01b39ee1641336989ea99d727272645d0b 100644 (file)
@@ -12,6 +12,7 @@
 #define SYSFS_MAGIC            0x62656572
 #define SECURITYFS_MAGIC       0x73636673
 #define SELINUX_MAGIC          0xf97cff8c
 #define SYSFS_MAGIC            0x62656572
 #define SECURITYFS_MAGIC       0x73636673
 #define SELINUX_MAGIC          0xf97cff8c
+#define RAMFS_MAGIC            0x858458f6      /* some random number */
 #define TMPFS_MAGIC            0x01021994
 #define HUGETLBFS_MAGIC        0x958458f6      /* some random number */
 #define SQUASHFS_MAGIC         0x73717368
 #define TMPFS_MAGIC            0x01021994
 #define HUGETLBFS_MAGIC        0x958458f6      /* some random number */
 #define SQUASHFS_MAGIC         0x73717368