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

Commit b502bd11 authored by Muthu Kumar's avatar Muthu Kumar Committed by Linus Torvalds
Browse files

magic.h: move some FS magic numbers into magic.h 



- Move open-coded filesystem magic numbers into magic.h

- Rearrange magic.h so that the filesystem-related constants are grouped
  together.

Signed-off-by: default avatarMuthukumar R <muthur@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d982d595

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ 
#include <linux/compat.h>

#include <linux/mount.h>

#include <linux/blkpg.h>

#include <linux/magic.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/map.h>



#include <asm/uaccess.h>



#define MTD_INODE_FS_MAGIC 0x11307854

static DEFINE_MUTEX(mtd_mutex);

static struct vfsmount *mtd_inode_mnt __read_mostly;

fs/binfmt_misc.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/sched.h>

#include <linux/magic.h>

#include <linux/binfmts.h>

#include <linux/slab.h>

#include <linux/ctype.h>
@@ -699,7 +700,7 @@ static int bm_fill_super(struct super_block * sb, void * data, int silent) 
		[3] = {"register", &bm_register_operations, S_IWUSR},

		/* last one */ {""}

	};

	int err = simple_fill_super(sb, 0x42494e4d, bm_files);

	int err = simple_fill_super(sb, BINFMTFS_MAGIC, bm_files);

	if (!err)

		sb->s_op = &s_ops;

	return err;

fs/block_dev.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/blkdev.h>

#include <linux/module.h>

#include <linux/blkpg.h>

#include <linux/magic.h>

#include <linux/buffer_head.h>

#include <linux/swap.h>

#include <linux/pagevec.h>
@@ -506,7 +507,7 @@ static const struct super_operations bdev_sops = { 
static struct dentry *bd_mount(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data)

{

	return mount_pseudo(fs_type, "bdev:", &bdev_sops, NULL, 0x62646576);

	return mount_pseudo(fs_type, "bdev:", &bdev_sops, NULL, BDEVFS_MAGIC);

}



static struct file_system_type bd_type = {

fs/pipe.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/fs.h>

#include <linux/log2.h>

#include <linux/mount.h>

#include <linux/magic.h>

#include <linux/pipe_fs_i.h>

#include <linux/uio.h>

#include <linux/highmem.h>

include/linux/magic.h

+12 −6
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#define CRAMFS_MAGIC		0x28cd3d45	/* some random number */

#define CRAMFS_MAGIC_WEND	0x453dcd28	/* magic number with the wrong endianess */

#define DEBUGFS_MAGIC          0x64626720

#define SYSFS_MAGIC		0x62656572

#define SECURITYFS_MAGIC	0x73636673

#define SELINUX_MAGIC		0xf97cff8c

#define RAMFS_MAGIC		0x858458f6	/* some random number */
@@ -27,7 +26,6 @@ 
#define HPFS_SUPER_MAGIC	0xf995e849

#define ISOFS_SUPER_MAGIC	0x9660

#define JFFS2_SUPER_MAGIC	0x72b6

#define ANON_INODE_FS_MAGIC	0x09041934

#define PSTOREFS_MAGIC		0x6165676C



#define MINIX_SUPER_MAGIC	0x137F		/* minix v1 fs, 14 char names */
@@ -40,7 +38,6 @@ 
#define NCP_SUPER_MAGIC		0x564c		/* Guess, what 0x564c is :-) */

#define NFS_SUPER_MAGIC		0x6969

#define OPENPROM_SUPER_MAGIC	0x9fa1

#define PROC_SUPER_MAGIC	0x9fa0

#define QNX4_SUPER_MAGIC	0x002f		/* qnx4 fs detection */

#define QNX6_SUPER_MAGIC	0x68191122	/* qnx6 fs detection */
@@ -52,15 +49,24 @@ 
#define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"



#define SMB_SUPER_MAGIC		0x517B

#define USBDEVICE_SUPER_MAGIC	0x9fa2

#define CGROUP_SUPER_MAGIC	0x27e0eb



#define FUTEXFS_SUPER_MAGIC	0xBAD1DEA



#define STACK_END_MAGIC		0x57AC6E9D



#define V9FS_MAGIC		0x01021997



#define BDEVFS_MAGIC            0x62646576

#define BINFMTFS_MAGIC          0x42494e4d

#define DEVPTS_SUPER_MAGIC	0x1cd1

#define FUTEXFS_SUPER_MAGIC	0xBAD1DEA

#define PIPEFS_MAGIC            0x50495045

#define PROC_SUPER_MAGIC	0x9fa0

#define SOCKFS_MAGIC		0x534F434B

#define V9FS_MAGIC		0x01021997

#define SYSFS_MAGIC		0x62656572

#define USBDEVICE_SUPER_MAGIC	0x9fa2

#define MTD_INODE_FS_MAGIC      0x11307854

#define ANON_INODE_FS_MAGIC	0x09041934





#endif /* __LINUX_MAGIC_H__ */