Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1bcbf31337391a2f54ef6c1e8871c2de5944a7dc

Authored by Qinghuang Feng
Committed by Linus Torvalds
1 parent 71038f527f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Qinghuang Feng <qhfeng.kernel@gmail.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -38,6 +38,7 @@
38 38 #include <linux/namei.h>
39 39 #include <linux/miscdevice.h>
40 40 #include <linux/version.h>
  41 +#include <linux/magic.h>
41 42 #include "compat.h"
42 43 #include "ctree.h"
43 44 #include "disk-io.h"
... ... @@ -51,7 +52,6 @@
51 52 #include "export.h"
52 53 #include "compression.h"
53 54  
54   -#define BTRFS_SUPER_MAGIC 0x9123683E
55 55  
56 56 static struct super_operations btrfs_super_ops;
57 57  
fs/squashfs/squashfs_fs.h
Diff comments   View file @ 1bcbf31
... ... @@ -26,7 +26,6 @@
26 26 #define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE
27 27 #define SQUASHFS_MAJOR 4
28 28 #define SQUASHFS_MINOR 0
29   -#define SQUASHFS_MAGIC 0x73717368
30 29 #define SQUASHFS_START 0
31 30  
32 31 /* size of metadata (inode and directory) blocks */
... ... @@ -35,6 +35,7 @@
35 35 #include <linux/init.h>
36 36 #include <linux/module.h>
37 37 #include <linux/zlib.h>
  38 +#include <linux/magic.h>
38 39  
39 40 #include "squashfs_fs.h"
40 41 #include "squashfs_fs_sb.h"
include/linux/magic.h
Diff comments   View file @ 1bcbf31
... ... @@ -10,11 +10,13 @@
10 10 #define SYSFS_MAGIC 0x62656572
11 11 #define SECURITYFS_MAGIC 0x73636673
12 12 #define TMPFS_MAGIC 0x01021994
  13 +#define SQUASHFS_MAGIC 0x73717368
13 14 #define EFS_SUPER_MAGIC 0x414A53
14 15 #define EXT2_SUPER_MAGIC 0xEF53
15 16 #define EXT3_SUPER_MAGIC 0xEF53
16 17 #define XENFS_SUPER_MAGIC 0xabba1974
17 18 #define EXT4_SUPER_MAGIC 0xEF53
  19 +#define BTRFS_SUPER_MAGIC 0x9123683E
18 20 #define HPFS_SUPER_MAGIC 0xf995e849
19 21 #define ISOFS_SUPER_MAGIC 0x9660
20 22 #define JFFS2_SUPER_MAGIC 0x72b6