updated squashfs with patches from debian for kernel 2.6.23

http://git.debian.org/?p=collab-maint/squashfs.git;a=commit;h=89561e486c18d804379a16cc7296e4316634d366

1 files changed, 52 insertions, 41 deletions

diff --git a/kernel/squashfs3.2-patch b/kernel/squashfs3.2-patch
index 783d432..d2ea6df 100644
--- a/kernel/squashfs3.2-patch
+++ b/kernel/squashfs3.2-patch
@@ -1,19 +1,7 @@
----
- fs/Kconfig                     |   65 +
- fs/Makefile                    |    1 
- fs/squashfs/Makefile           |    7 
- fs/squashfs/inode.c            | 2327 +++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h         |   87 +
- fs/squashfs/squashfs2_0.c      |  742 +++++++++++++
- include/linux/squashfs_fs.h    |  934 ++++++++++++++++
- include/linux/squashfs_fs_i.h  |   45 
- include/linux/squashfs_fs_sb.h |   74 +
- init/do_mounts_rd.c            |   16 
- 10 files changed, 4298 insertions(+)
-
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1367,6 +1367,71 @@ config CRAMFS
+diff -Nru linux-2.6.23.1.orig/fs/Kconfig linux-2.6.23.1/fs/Kconfig
+--- linux-2.6.23.1.orig/fs/Kconfig	2007-10-22 14:00:10.000000000 +0200
++++ linux-2.6.23.1/fs/Kconfig	2007-10-22 14:00:50.000000000 +0200
+@@ -1364,6 +1364,71 @@
  
  	  If unsure, say N.
  
@@ -85,9 +73,10 @@
  config VXFS_FS
  	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
  	depends on BLOCK
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD)		+= jbd/
+diff -Nru linux-2.6.23.1.orig/fs/Makefile linux-2.6.23.1/fs/Makefile
+--- linux-2.6.23.1.orig/fs/Makefile	2007-10-22 14:00:10.000000000 +0200
++++ linux-2.6.23.1/fs/Makefile	2007-10-22 14:00:50.000000000 +0200
+@@ -72,6 +72,7 @@
  obj-$(CONFIG_JBD2)		+= jbd2/
  obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
@@ -95,8 +84,9 @@
  obj-$(CONFIG_RAMFS)		+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
  obj-$(CONFIG_CODA_FS)		+= coda/
---- /dev/null
-+++ b/fs/squashfs/Makefile
+diff -Nru linux-2.6.23.1.orig/fs/squashfs/Makefile linux-2.6.23.1/fs/squashfs/Makefile
+--- linux-2.6.23.1.orig/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/fs/squashfs/Makefile	2007-10-22 14:00:52.000000000 +0200
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the linux squashfs routines.
@@ -105,9 +95,10 @@
 +obj-$(CONFIG_SQUASHFS) += squashfs.o
 +squashfs-y += inode.o
 +squashfs-y += squashfs2_0.o
---- /dev/null
-+++ b/fs/squashfs/inode.c
-@@ -0,0 +1,2328 @@
+diff -Nru linux-2.6.23.1.orig/fs/squashfs/inode.c linux-2.6.23.1/fs/squashfs/inode.c
+--- linux-2.6.23.1.orig/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/fs/squashfs/inode.c	2007-10-22 14:01:59.000000000 +0200
+@@ -0,0 +1,2342 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
@@ -133,6 +124,7 @@
 +
 +#include <linux/squashfs_fs.h>
 +#include <linux/module.h>
++#include <linux/version.h>
 +#include <linux/zlib.h>
 +#include <linux/fs.h>
 +#include <linux/squashfs_fs_sb.h>
@@ -141,7 +133,10 @@
 +#include <linux/vfs.h>
 +#include <linux/vmalloc.h>
 +#include <linux/smp_lock.h>
-+#include <linux/sched.h>
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
++#include <linux/exportfs.h>
++#endif
 +
 +#include "squashfs.h"
 +
@@ -2409,6 +2404,12 @@
 +{
 +	struct squashfs_inode_info *ei = foo;
 +
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
++							SLAB_CTOR_CONSTRUCTOR)
++		return;
++#endif
++
 +	inode_init_once(&ei->vfs_inode);
 +}
 + 
@@ -2418,7 +2419,11 @@
 +	squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache",
 +	     sizeof(struct squashfs_inode_info),
 +	     0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23))
 +	     init_once, NULL);
++#else
++	     init_once);
++#endif
 +	if (squashfs_inode_cachep == NULL)
 +		return -ENOMEM;
 +	return 0;
@@ -2436,8 +2441,9 @@
 +MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 +MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/fs/squashfs/squashfs.h
+diff -Nru linux-2.6.23.1.orig/fs/squashfs/squashfs.h linux-2.6.23.1/fs/squashfs/squashfs.h
+--- linux-2.6.23.1.orig/fs/squashfs/squashfs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/fs/squashfs/squashfs.h	2007-10-22 14:00:52.000000000 +0200
 @@ -0,0 +1,87 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2526,8 +2532,9 @@
 +	return 0;
 +}
 +#endif
---- /dev/null
-+++ b/fs/squashfs/squashfs2_0.c
+diff -Nru linux-2.6.23.1.orig/fs/squashfs/squashfs2_0.c linux-2.6.23.1/fs/squashfs/squashfs2_0.c
+--- linux-2.6.23.1.orig/fs/squashfs/squashfs2_0.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/fs/squashfs/squashfs2_0.c	2007-10-22 14:00:52.000000000 +0200
 @@ -0,0 +1,742 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -3271,8 +3278,9 @@
 +
 +	return 1;
 +}
---- /dev/null
-+++ b/include/linux/squashfs_fs.h
+diff -Nru linux-2.6.23.1.orig/include/linux/squashfs_fs.h linux-2.6.23.1/include/linux/squashfs_fs.h
+--- linux-2.6.23.1.orig/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/include/linux/squashfs_fs.h	2007-10-22 14:00:52.000000000 +0200
 @@ -0,0 +1,934 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -4208,8 +4216,9 @@
 +
 +#endif
 +#endif
---- /dev/null
-+++ b/include/linux/squashfs_fs_i.h
+diff -Nru linux-2.6.23.1.orig/include/linux/squashfs_fs_i.h linux-2.6.23.1/include/linux/squashfs_fs_i.h
+--- linux-2.6.23.1.orig/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/include/linux/squashfs_fs_i.h	2007-10-22 14:00:52.000000000 +0200
 @@ -0,0 +1,45 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@@ -4256,8 +4265,9 @@
 +	struct inode	vfs_inode;
 +};
 +#endif
---- /dev/null
-+++ b/include/linux/squashfs_fs_sb.h
+diff -Nru linux-2.6.23.1.orig/include/linux/squashfs_fs_sb.h linux-2.6.23.1/include/linux/squashfs_fs_sb.h
+--- linux-2.6.23.1.orig/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.1/include/linux/squashfs_fs_sb.h	2007-10-22 14:00:52.000000000 +0200
 @@ -0,0 +1,74 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@@ -4333,8 +4343,9 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
---- a/init/do_mounts_rd.c
-+++ b/init/do_mounts_rd.c
+diff -Nru linux-2.6.23.1.orig/init/do_mounts_rd.c linux-2.6.23.1/init/do_mounts_rd.c
+--- linux-2.6.23.1.orig/init/do_mounts_rd.c	2007-10-22 14:00:11.000000000 +0200
++++ linux-2.6.23.1/init/do_mounts_rd.c	2007-10-22 14:00:52.000000000 +0200
 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>
@@ -4343,7 +4354,7 @@
  #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:
@@ -4351,7 +4362,7 @@
   * 	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;
@@ -4359,7 +4370,7 @@
  	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;
@@ -4367,7 +4378,7 @@
  	memset(buf, 0xe5, size);
  
  	/*
-@@ -101,6 +105,18 @@ identify_ramdisk_image(int fd, int start
+@@ -101,6 +105,18 @@
  		goto done;
  	}