iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Qinghuang Feng 2009-01-15 13:51:03 -08:00 committed by Linus Torvalds
parent 71038f527f
commit 1bcbf31337
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/super.c
View File

@ -38,6 +38,7 @@
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/magic.h>
#include "compat.h" #include "compat.h"
#include "ctree.h" #include "ctree.h"
#include "disk-io.h" #include "disk-io.h"
@ -51,7 +52,6 @@
#include "export.h" #include "export.h"
#include "compression.h" #include "compression.h"
#define BTRFS_SUPER_MAGIC 0x9123683E
static struct super_operations btrfs_super_ops; static struct super_operations btrfs_super_ops;

1
fs/squashfs/squashfs_fs.h
View File

@ -26,7 +26,6 @@
#define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE #define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE
#define SQUASHFS_MAJOR 4 #define SQUASHFS_MAJOR 4
#define SQUASHFS_MINOR 0 #define SQUASHFS_MINOR 0
#define SQUASHFS_MAGIC 0x73717368
#define SQUASHFS_START 0 #define SQUASHFS_START 0
/* size of metadata (inode and directory) blocks */ /* size of metadata (inode and directory) blocks */

1
fs/squashfs/super.c
View File

@ -35,6 +35,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/zlib.h> #include <linux/zlib.h>
#include <linux/magic.h>
#include "squashfs_fs.h" #include "squashfs_fs.h"
#include "squashfs_fs_sb.h" #include "squashfs_fs_sb.h"

2
include/linux/magic.h
View File

@ -10,11 +10,13 @@
#define SYSFS_MAGIC 0x62656572 #define SYSFS_MAGIC 0x62656572
#define SECURITYFS_MAGIC 0x73636673 #define SECURITYFS_MAGIC 0x73636673
#define TMPFS_MAGIC 0x01021994 #define TMPFS_MAGIC 0x01021994
#define SQUASHFS_MAGIC 0x73717368
#define EFS_SUPER_MAGIC 0x414A53 #define EFS_SUPER_MAGIC 0x414A53
#define EXT2_SUPER_MAGIC 0xEF53 #define EXT2_SUPER_MAGIC 0xEF53
#define EXT3_SUPER_MAGIC 0xEF53 #define EXT3_SUPER_MAGIC 0xEF53
#define XENFS_SUPER_MAGIC 0xabba1974 #define XENFS_SUPER_MAGIC 0xabba1974
#define EXT4_SUPER_MAGIC 0xEF53 #define EXT4_SUPER_MAGIC 0xEF53
#define BTRFS_SUPER_MAGIC 0x9123683E
#define HPFS_SUPER_MAGIC 0xf995e849 #define HPFS_SUPER_MAGIC 0xf995e849
#define ISOFS_SUPER_MAGIC 0x9660 #define ISOFS_SUPER_MAGIC 0x9660
#define JFFS2_SUPER_MAGIC 0x72b6 #define JFFS2_SUPER_MAGIC 0x72b6