Author: hawk Date: Wed Jul 25 08:14:16 2007 GMT
Module: SOURCES Tag: hawk-LINUX_2_6
---- Log message:
- updated for 2.6.22.1
---- Files affected:
SOURCES:
squashfs3.2-patch (1.1.2.1.4.2 -> 1.1.2.1.4.3)
---- Diffs:
================================================================
Index: SOURCES/squashfs3.2-patch
diff -u SOURCES/squashfs3.2-patch:1.1.2.1.4.2
SOURCES/squashfs3.2-patch:1.1.2.1.4.3
--- SOURCES/squashfs3.2-patch:1.1.2.1.4.2 Wed Feb 14 09:40:46 2007
+++ SOURCES/squashfs3.2-patch Wed Jul 25 10:14:11 2007
@@ -1,7 +1,7 @@
-diff -x .gitignore -Nurp linux-2.6.20/fs/Kconfig
linux-2.6.20-squashfs3.2-r2/fs/Kconfig
---- linux-2.6.20/fs/Kconfig 2006-12-25 01:13:12.000000000 +0000
-+++ linux-2.6.20-squashfs3.2-r2/fs/Kconfig 2007-01-16 02:06:03.000000000
+0000
-@@ -1404,6 +1404,71 @@ config CRAMFS
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/fs/Kconfig
linux-2.6.22.1/fs/Kconfig
+--- linux-2.6.22.1.orig/fs/Kconfig 2007-07-16 18:56:11.000000000 +0200
++++ linux-2.6.22.1/fs/Kconfig 2007-07-16 18:27:00.000000000 +0200
+@@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N.
@@ -73,10 +73,10 @@
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
-diff -x .gitignore -Nurp linux-2.6.20/fs/Makefile
linux-2.6.20-squashfs3.2-r2/fs/Makefile
---- linux-2.6.20/fs/Makefile 2006-12-25 01:13:12.000000000 +0000
-+++ linux-2.6.20-squashfs3.2-r2/fs/Makefile 2007-01-16 02:06:03.000000000
+0000
-@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/fs/Makefile
linux-2.6.22.1/fs/Makefile
+--- linux-2.6.22.1.orig/fs/Makefile 2007-07-16 18:56:11.000000000 +0200
++++ linux-2.6.22.1/fs/Makefile 2007-07-16 18:27:00.000000000 +0200
+@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@@ -84,10 +84,10 @@
obj-$(CONFIG_RAMFS) += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
-diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/inode.c
linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c
---- linux-2.6.20/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c 2007-01-16
02:28:36.000000000 +0000
-@@ -0,0 +1,2329 @@
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/fs/squashfs/inode.c
linux-2.6.22.1/fs/squashfs/inode.c
+--- linux-2.6.22.1.orig/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000
+0100
++++ linux-2.6.22.1/fs/squashfs/inode.c 2007-07-16 19:07:15.000000000 +0200
+@@ -0,0 +1,2327 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+ *
@@ -115,6 +115,7 @@
+#include <linux/module.h>
+#include <linux/zlib.h>
+#include <linux/fs.h>
++#include <linux/sched.h>
+#include <linux/squashfs_fs_sb.h>
+#include <linux/squashfs_fs_i.h>
+#include <linux/buffer_head.h>
@@ -2387,10 +2388,7 @@
+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long
flags)
+{
+ struct squashfs_inode_info *ei = foo;
-+
-+ if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-+ SLAB_CTOR_CONSTRUCTOR)
-+ inode_init_once(&ei->vfs_inode);
++ inode_init_once(&ei->vfs_inode);
+}
+
+
@@ -2417,9 +2415,9 @@
+MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <[EMAIL PROTECTED]>");
+MODULE_LICENSE("GPL");
-diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/Makefile
linux-2.6.20-squashfs3.2-r2/fs/squashfs/Makefile
---- linux-2.6.20/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/Makefile 2007-01-12
00:06:09.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/fs/squashfs/Makefile
linux-2.6.22.1/fs/squashfs/Makefile
+--- linux-2.6.22.1.orig/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000
+0100
++++ linux-2.6.22.1/fs/squashfs/Makefile 2007-07-16 18:27:00.000000000
+0200
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@@ -2428,9 +2426,9 @@
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
-diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/squashfs2_0.c
linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs2_0.c
---- linux-2.6.20/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs2_0.c 2007-01-12
02:27:20.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/fs/squashfs/squashfs2_0.c
linux-2.6.22.1/fs/squashfs/squashfs2_0.c
+--- linux-2.6.22.1.orig/fs/squashfs/squashfs2_0.c 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.22.1/fs/squashfs/squashfs2_0.c 2007-07-16 18:27:00.000000000
+0200
@@ -0,0 +1,742 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -3174,9 +3172,9 @@
+
+ return 1;
+}
-diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/squashfs.h
linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs.h
---- linux-2.6.20/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000
+0100
-+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs.h 2007-01-12
01:42:11.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/fs/squashfs/squashfs.h
linux-2.6.22.1/fs/squashfs/squashfs.h
+--- linux-2.6.22.1.orig/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000
+0100
++++ linux-2.6.22.1/fs/squashfs/squashfs.h 2007-07-16 18:27:00.000000000
+0200
@@ -0,0 +1,87 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -3265,9 +3263,9 @@
+ return 0;
+}
+#endif
-diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs.h
linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs.h
---- linux-2.6.20/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000
+0100
-+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs.h 2007-01-12
00:06:09.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/include/linux/squashfs_fs.h
linux-2.6.22.1/include/linux/squashfs_fs.h
+--- linux-2.6.22.1.orig/include/linux/squashfs_fs.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.22.1/include/linux/squashfs_fs.h 2007-07-16 18:27:00.000000000
+0200
@@ -0,0 +1,934 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -4203,9 +4201,9 @@
+
+#endif
+#endif
-diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs_i.h
linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_i.h
---- linux-2.6.20/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000
+0100
-+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_i.h 2007-01-12
00:06:09.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/include/linux/squashfs_fs_i.h
linux-2.6.22.1/include/linux/squashfs_fs_i.h
+--- linux-2.6.22.1.orig/include/linux/squashfs_fs_i.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.22.1/include/linux/squashfs_fs_i.h 2007-07-16
18:27:00.000000000 +0200
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -4252,9 +4250,9 @@
+ struct inode vfs_inode;
+};
+#endif
-diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs_sb.h
linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_sb.h
---- linux-2.6.20/include/linux/squashfs_fs_sb.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_sb.h 2007-01-12
01:23:47.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/include/linux/squashfs_fs_sb.h
linux-2.6.22.1/include/linux/squashfs_fs_sb.h
+--- linux-2.6.22.1.orig/include/linux/squashfs_fs_sb.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.22.1/include/linux/squashfs_fs_sb.h 2007-07-16
18:27:00.000000000 +0200
@@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@ -4330,9 +4328,9 @@
+ int (*read_fragment_index_table)(struct super_block
*s);
+};
+#endif
-diff -x .gitignore -Nurp linux-2.6.20/init/do_mounts_rd.c
linux-2.6.20-squashfs3.2-r2/init/do_mounts_rd.c
---- linux-2.6.20/init/do_mounts_rd.c 2006-11-29 21:57:37.000000000 +0000
-+++ linux-2.6.20-squashfs3.2-r2/init/do_mounts_rd.c 2007-01-16
02:06:03.000000000 +0000
+diff -x .gitignore -Nurp linux-2.6.22.1.orig/init/do_mounts_rd.c
linux-2.6.22.1/init/do_mounts_rd.c
+--- linux-2.6.22.1.orig/init/do_mounts_rd.c 2007-07-16 18:56:11.000000000
+0200
++++ linux-2.6.22.1/init/do_mounts_rd.c 2007-07-16 18:27:00.000000000 +0200
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/squashfs3.2-patch?r1=1.1.2.1.4.2&r2=1.1.2.1.4.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
