diff options
author | maximilian attems <max@stro.at> | 2009-09-22 19:45:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:42 -0400 |
commit | a7e3108cca54c105f496919040f00df56767ec00 (patch) | |
tree | 42aaadd3648bada66632f50e9658d37bf7bb16c8 | |
parent | 0d4c36a9b6ab6b15851f60956d901a3c53574ea8 (diff) |
ramfs: move RAMFS_MAGIC to include/linux/magic.h
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>
-rw-r--r-- | fs/ramfs/inode.c | 4 | ||||
-rw-r--r-- | include/linux/magic.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index a7f0110fca4c..a6090aa1a7c1 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c | |||
@@ -34,12 +34,10 @@ | |||
34 | #include <linux/ramfs.h> | 34 | #include <linux/ramfs.h> |
35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
36 | #include <linux/parser.h> | 36 | #include <linux/parser.h> |
37 | #include <linux/magic.h> | ||
37 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
38 | #include "internal.h" | 39 | #include "internal.h" |
39 | 40 | ||
40 | /* some random number */ | ||
41 | #define RAMFS_MAGIC 0x858458f6 | ||
42 | |||
43 | #define RAMFS_DEFAULT_MODE 0755 | 41 | #define RAMFS_DEFAULT_MODE 0755 |
44 | 42 | ||
45 | static const struct super_operations ramfs_ops; | 43 | static const struct super_operations ramfs_ops; |
diff --git a/include/linux/magic.h b/include/linux/magic.h index bce37786a0a5..76285e01b39e 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #define SYSFS_MAGIC 0x62656572 | 12 | #define SYSFS_MAGIC 0x62656572 |
13 | #define SECURITYFS_MAGIC 0x73636673 | 13 | #define SECURITYFS_MAGIC 0x73636673 |
14 | #define SELINUX_MAGIC 0xf97cff8c | 14 | #define SELINUX_MAGIC 0xf97cff8c |
15 | #define RAMFS_MAGIC 0x858458f6 /* some random number */ | ||
15 | #define TMPFS_MAGIC 0x01021994 | 16 | #define TMPFS_MAGIC 0x01021994 |
16 | #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ | 17 | #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ |
17 | #define SQUASHFS_MAGIC 0x73717368 | 18 | #define SQUASHFS_MAGIC 0x73717368 |