From 833e4bbd524aa17c5308fd7e8bcfd7e13d9fe817 Mon Sep 17 00:00:00 2001
From: Qinghuang Feng <qhfeng.kernel@gmail.com>
Date: Thu, 15 Jan 2009 13:51:03 -0800
Subject: [PATCH] --- yaml --- r: 129675 b: refs/heads/master c:
 1bcbf31337391a2f54ef6c1e8871c2de5944a7dc h: refs/heads/master i:   129673:
 5848807bd8ae21558a7f1ca88f2ef85f1065fb4c   129671:
 9d9a498f1a4be8a5d9d164078073c66d8b9421e3 v: v3

---
 [refs]                          | 2 +-
 trunk/fs/btrfs/super.c          | 2 +-
 trunk/fs/squashfs/squashfs_fs.h | 1 -
 trunk/fs/squashfs/super.c       | 1 +
 trunk/include/linux/magic.h     | 2 ++
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 65be7a3045a9..cacc4b292c21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71038f527f3665f562cf9afe083df729958a099b
+refs/heads/master: 1bcbf31337391a2f54ef6c1e8871c2de5944a7dc
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 0a14b495532f..7256cf242eb0 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -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;
 
diff --git a/trunk/fs/squashfs/squashfs_fs.h b/trunk/fs/squashfs/squashfs_fs.h
index 6840da1bf21e..283daafc568e 100644
--- a/trunk/fs/squashfs/squashfs_fs.h
+++ b/trunk/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/trunk/fs/squashfs/super.c b/trunk/fs/squashfs/super.c
index a0466d7467b2..071df5b5b491 100644
--- a/trunk/fs/squashfs/super.c
+++ b/trunk/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"
diff --git a/trunk/include/linux/magic.h b/trunk/include/linux/magic.h
index 439f6f3cb0c4..0b4df7eba852 100644
--- a/trunk/include/linux/magic.h
+++ b/trunk/include/linux/magic.h
@@ -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