aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-06-05 17:01:00 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-06-05 17:01:00 +0000
commit2ff1596a2249657e543c0cdd7ba3b05eb33e645c (patch)
treebfeb7a11889eb81e2e7f16bcd91b913b1a124ba6 /target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch
parent04fd31f429a5450df483fa5178678b6de2b91e8c (diff)
downloadupstream-2ff1596a2249657e543c0cdd7ba3b05eb33e645c.tar.gz
upstream-2ff1596a2249657e543c0cdd7ba3b05eb33e645c.tar.bz2
upstream-2ff1596a2249657e543c0cdd7ba3b05eb33e645c.zip
refresh generic 2.6.23 patches in upstream style
SVN-Revision: 11366
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch64
1 files changed, 21 insertions, 43 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch
index a5d4a0b0c3..6fa0f0cc79 100644
--- a/target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/001-squashfs.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23.17/fs/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/fs/Kconfig
-+++ linux-2.6.23.17/fs/Kconfig
-@@ -1364,6 +1364,71 @@ config CRAMFS
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -1364,6 +1364,71 @@
If unsure, say N.
@@ -74,11 +72,9 @@ Index: linux-2.6.23.17/fs/Kconfig
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
-Index: linux-2.6.23.17/fs/Makefile
-===================================================================
---- linux-2.6.23.17.orig/fs/Makefile
-+++ linux-2.6.23.17/fs/Makefile
-@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -72,6 +72,7 @@
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@@ -86,10 +82,8 @@ Index: linux-2.6.23.17/fs/Makefile
obj-$(CONFIG_RAMFS) += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
-Index: linux-2.6.23.17/fs/squashfs/inode.c
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/fs/squashfs/inode.c
++++ b/fs/squashfs/inode.c
@@ -0,0 +1,2122 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -2213,10 +2207,8 @@ Index: linux-2.6.23.17/fs/squashfs/inode.c
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.23.17/fs/squashfs/Makefile
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@@ -2225,10 +2217,8 @@ Index: linux-2.6.23.17/fs/squashfs/Makefile
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
-Index: linux-2.6.23.17/fs/squashfs/squashfs2_0.c
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/fs/squashfs/squashfs2_0.c
++++ b/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,758 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -2988,10 +2978,8 @@ Index: linux-2.6.23.17/fs/squashfs/squashfs2_0.c
+
+ return 1;
+}
-Index: linux-2.6.23.17/fs/squashfs/squashfs.h
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
@@ -0,0 +1,86 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -3079,10 +3067,8 @@ Index: linux-2.6.23.17/fs/squashfs/squashfs.h
+ return 0;
+}
+#endif
-Index: linux-2.6.23.17/include/linux/magic.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/magic.h
-+++ linux-2.6.23.17/include/linux/magic.h
+--- a/include/linux/magic.h
++++ b/include/linux/magic.h
@@ -35,6 +35,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@@ -3093,10 +3079,8 @@ Index: linux-2.6.23.17/include/linux/magic.h
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
-Index: linux-2.6.23.17/include/linux/squashfs_fs.h
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/include/linux/squashfs_fs.h
++++ b/include/linux/squashfs_fs.h
@@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -4009,10 +3993,8 @@ Index: linux-2.6.23.17/include/linux/squashfs_fs.h
+
+#endif
+#endif
-Index: linux-2.6.23.17/include/linux/squashfs_fs_i.h
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/include/linux/squashfs_fs_i.h
++++ b/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -4059,10 +4041,8 @@ Index: linux-2.6.23.17/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode;
+};
+#endif
-Index: linux-2.6.23.17/include/linux/squashfs_fs_sb.h
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/include/linux/squashfs_fs_sb.h
++++ b/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@ -4138,10 +4118,8 @@ Index: linux-2.6.23.17/include/linux/squashfs_fs_sb.h
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
-Index: linux-2.6.23.17/init/do_mounts_rd.c
-===================================================================
---- linux-2.6.23.17.orig/init/do_mounts_rd.c
-+++ linux-2.6.23.17/init/do_mounts_rd.c
+--- a/init/do_mounts_rd.c
++++ b/init/do_mounts_rd.c
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
@@ -4150,7 +4128,7 @@ Index: linux-2.6.23.17/init/do_mounts_rd.c
#include <linux/initrd.h>
#include <linux/string.h>
-@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
+@@ -39,6 +40,7 @@
* numbers could not be found.
*
* We currently check for the following magic numbers:
@@ -4158,7 +4136,7 @@ Index: linux-2.6.23.17/init/do_mounts_rd.c
* minix
* ext2
* romfs
-@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
+@@ -53,6 +55,7 @@
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
@@ -4166,7 +4144,7 @@ Index: linux-2.6.23.17/init/do_mounts_rd.c
int nblocks = -1;
unsigned char *buf;
-@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
+@@ -64,6 +67,7 @@
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
@@ -4174,7 +4152,7 @@ Index: linux-2.6.23.17/init/do_mounts_rd.c
memset(buf, 0xe5, size);
/*
-@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
+@@ -101,6 +105,15 @@
goto done;
}