rpms/kernel/FC-5 linux-2.6-squashfs.patch,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10413

Modified Files:
	linux-2.6-squashfs.patch 
Log Message:
take squashfs patch from FC6


linux-2.6-squashfs.patch:
 linux-2.6.19.noarch/fs/Kconfig        |   65 
 linux-2.6.19.noarch/fs/Makefile       |    1 
 linux-2.6.19.ppc/fs/squashfs/Makefile |    3 
 squash/fs/squashfs/inode.c            | 2299 ++++++++++++++++++++++++++++++++++
 squash/fs/squashfs/squashfs.h         |   87 +
 squash/fs/squashfs/squashfs2_0.c      |  757 +++++++++++
 squash/include/linux/squashfs_fs.h    |  934 +++++++++++++
 squash/include/linux/squashfs_fs_i.h  |   45 
 squash/include/linux/squashfs_fs_sb.h |   76 +
 9 files changed, 4267 insertions(+)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-squashfs.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-squashfs.patch	20 Dec 2006 19:20:45 -0000	1.6
+++ linux-2.6-squashfs.patch	16 Feb 2007 20:37:36 -0000	1.7
@@ -2249,13 +2249,13 @@
 +}
 +
 +
-+static kmem_cache_t * squashfs_inode_cachep;
++static struct kmem_cache *squashfs_inode_cachep;
 +
 +
 +static struct inode *squashfs_alloc_inode(struct super_block *sb)
 +{
 +	struct squashfs_inode_info *ei;
-+	ei = kmem_cache_alloc(squashfs_inode_cachep, SLAB_KERNEL);
++	ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL);
 +	if (!ei)
 +		return NULL;
 +	return &ei->vfs_inode;
@@ -2268,7 +2268,7 @@
 +}
 +
 +
-+static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
++static void init_once(void * foo, struct kmem_cache *cachep, unsigned long flags)
 +{
 +	struct squashfs_inode_info *ei = foo;
 +
@@ -4304,13 +4304,9 @@
  obj-$(CONFIG_RAMFS)		+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
  obj-$(CONFIG_CODA_FS)		+= coda/
---- linux-2.6.19.noarch/fs/squashfs/Makefile~	2006-12-19 00:37:24.000000000 -0500
-+++ linux-2.6.19.noarch/fs/squashfs/Makefile	2006-12-19 00:37:29.000000000 -0500
-@@ -0,0 +1,7 @@
-+#
-+# Makefile for the linux squashfs routines.
-+#
-+
+--- /dev/null	2006-12-18 15:12:55.143924919 +0000
++++ linux-2.6.19.ppc/fs/squashfs/Makefile	2006-12-19 11:15:13.000000000 +0000
+@@ -0,0 +1,3 @@
 +obj-$(CONFIG_SQUASHFS) += squashfs.o
-+squashfs-y += inode.o
-+squashfs-y += squashfs2_0.o
++
++squashfs-objs := inode.o squashfs2_0.o