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

Commit a7e3108c authored Sep 22, 2009 by maximilian attems Committed by Linus Torvalds Sep 23, 2009

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>

parent 0d4c36a9

fs/ramfs/inode.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -34,12 +34,10 @@
	#include <linux/ramfs.h>		#include <linux/ramfs.h>
	#include <linux/sched.h>		#include <linux/sched.h>
	#include <linux/parser.h>		#include <linux/parser.h>
			#include <linux/magic.h>
	#include <asm/uaccess.h>		#include <asm/uaccess.h>
	#include "internal.h"		#include "internal.h"

	/* some random number */
	#define RAMFS_MAGIC 0x858458f6

	#define RAMFS_DEFAULT_MODE 0755		#define RAMFS_DEFAULT_MODE 0755

	static const struct super_operations ramfs_ops;		static const struct super_operations ramfs_ops;

include/linux/magic.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@
	#define SYSFS_MAGIC 0x62656572		#define SYSFS_MAGIC 0x62656572
	#define SECURITYFS_MAGIC 0x73636673		#define SECURITYFS_MAGIC 0x73636673
	#define SELINUX_MAGIC 0xf97cff8c		#define SELINUX_MAGIC 0xf97cff8c
			#define RAMFS_MAGIC 0x858458f6 /* some random number */
	#define TMPFS_MAGIC 0x01021994		#define TMPFS_MAGIC 0x01021994
	#define HUGETLBFS_MAGIC 0x958458f6 /* some random number */		#define HUGETLBFS_MAGIC 0x958458f6 /* some random number */
	#define SQUASHFS_MAGIC 0x73717368		#define SQUASHFS_MAGIC 0x73717368