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

Commit 1bcbf313 authored by Qinghuang Feng's avatar Qinghuang Feng Committed by Linus Torvalds
Browse files

btrfs & squashfs: Move btrfs and squashfsto's magic number to <linux/magic.h> 



Use the standard magic.h for btrfs and squashfs.

Signed-off-by: default avatarQinghuang Feng <qhfeng.kernel@gmail.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71038f52

fs/btrfs/super.c

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

#include <linux/miscdevice.h>

#include <linux/version.h>

#include <linux/magic.h>

#include "compat.h"

#include "ctree.h"

#include "disk-io.h"
@@ -51,7 +52,6 @@ 
#include "export.h"

#include "compression.h"



#define BTRFS_SUPER_MAGIC 0x9123683E



static struct super_operations btrfs_super_ops;

fs/squashfs/squashfs_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#define SQUASHFS_CACHED_FRAGMENTS	CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE

#define SQUASHFS_MAJOR			4

#define SQUASHFS_MINOR			0

#define SQUASHFS_MAGIC			0x73717368

#define SQUASHFS_START			0



/* size of metadata (inode and directory) blocks */

fs/squashfs/super.c

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

#include <linux/module.h>

#include <linux/zlib.h>

#include <linux/magic.h>



#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

include/linux/magic.h

+2 −0
Original line number Diff line number Diff line
@@ -10,11 +10,13 @@ 
#define SYSFS_MAGIC		0x62656572

#define SECURITYFS_MAGIC	0x73636673

#define TMPFS_MAGIC		0x01021994

#define SQUASHFS_MAGIC		0x73717368

#define EFS_SUPER_MAGIC		0x414A53

#define EXT2_SUPER_MAGIC	0xEF53

#define EXT3_SUPER_MAGIC	0xEF53

#define XENFS_SUPER_MAGIC	0xabba1974

#define EXT4_SUPER_MAGIC	0xEF53

#define BTRFS_SUPER_MAGIC	0x9123683E

#define HPFS_SUPER_MAGIC	0xf995e849

#define ISOFS_SUPER_MAGIC	0x9660

#define JFFS2_SUPER_MAGIC	0x72b6