diff options
| author | Qinghuang Feng <qhfeng.kernel@gmail.com> | 2009-01-15 13:51:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:39:38 -0800 |
| commit | 1bcbf31337391a2f54ef6c1e8871c2de5944a7dc (patch) | |
| tree | f027bf7b9e0a96d1df01ecd860699c016a875963 /fs/squashfs | |
| parent | 71038f527f3665f562cf9afe083df729958a099b (diff) | |
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>
Diffstat (limited to 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/squashfs_fs.h | 1 | ||||
| -rw-r--r-- | fs/squashfs/super.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs_fs.h b/fs/squashfs/squashfs_fs.h index 6840da1bf21e..283daafc568e 100644 --- a/fs/squashfs/squashfs_fs.h +++ b/fs/squashfs/squashfs_fs.h @@ -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 */ diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index a0466d7467b2..071df5b5b491 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -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" |