The patch titled
btrfs & squashfs: Move btrfs and squashfsto's magic number to <linux/magic.h>
has been removed from the -mm tree. Its filename was
btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: btrfs & squashfs: Move btrfs and squashfsto's magic number to <linux/magic.h>
From: Qinghuang Feng <qhfeng.kernel@xxxxxxxxx>
Use the standard magic.h for btrfs and squashfs.
Signed-off-by: Qinghuang Feng <qhfeng.kernel@xxxxxxxxx>
Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxxxxxx>
Cc: Chris Mason <chris.mason@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/btrfs/super.c | 2 +-
fs/squashfs/squashfs_fs.h | 1 -
fs/squashfs/super.c | 1 +
include/linux/magic.h | 2 ++
4 files changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/btrfs/super.c~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich fs/btrfs/super.c
--- a/fs/btrfs/super.c~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich
+++ a/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 -puN fs/squashfs/squashfs_fs.h~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich fs/squashfs/squashfs_fs.h
--- a/fs/squashfs/squashfs_fs.h~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich
+++ a/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 -puN fs/squashfs/super.c~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich fs/squashfs/super.c
--- a/fs/squashfs/super.c~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich
+++ a/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 -puN include/linux/magic.h~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich include/linux/magic.h
--- a/include/linux/magic.h~btrfs-squashfs-move-btrfs-and-squashfstos-magic-number-to-linux-magich
+++ a/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
_
Patches currently in -mm which might be from qhfeng.kernel@xxxxxxxxx are
origin.patch
linux-next.patch
sysfs-use-standard-magich-for-sysfs.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
