SOURCES (LINUX_2_6): squashfs3.1-patch - 2.6.19 ready based on htt...
mguevara
mguevara at pld-linux.org
Wed Dec 13 14:43:15 CET 2006
Author: mguevara Date: Wed Dec 13 13:43:15 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- 2.6.19 ready based on http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.1-r2.tar.gz
from linux-2.6.18 with squashfs3.1-r2_for_2.6.19.patch applied
---- Files affected:
SOURCES:
squashfs3.1-patch (1.1.4.3 -> 1.1.4.4)
---- Diffs:
================================================================
Index: SOURCES/squashfs3.1-patch
diff -u SOURCES/squashfs3.1-patch:1.1.4.3 SOURCES/squashfs3.1-patch:1.1.4.4
--- SOURCES/squashfs3.1-patch:1.1.4.3 Tue Sep 19 15:29:28 2006
+++ SOURCES/squashfs3.1-patch Wed Dec 13 14:43:10 2006
@@ -1,7 +1,7 @@
-diff --new-file -urp linux-2.6.17/fs/Kconfig linux-2.6.17-squashfs3.1/fs/Kconfig
---- linux-2.6.17/fs/Kconfig 2006-06-18 02:49:35.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/fs/Kconfig 2006-08-20 01:16:02.000000000 +0100
-@@ -1188,6 +1188,71 @@ config CRAMFS
+diff --new-file -urp linux-2.6.18/fs/Kconfig linux-2.6.18-squashfs3.1/fs/Kconfig
+--- linux-2.6.18/fs/Kconfig 2006-08-11 00:03:11.000000000 +0100
++++ linux-2.6.18-squashfs3.1/fs/Kconfig 2006-08-21 00:13:12.000000000 +0100
+@@ -1249,6 +1249,71 @@ config CRAMFS
If unsure, say N.
@@ -73,10 +73,10 @@
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
help
-diff --new-file -urp linux-2.6.17/fs/Makefile linux-2.6.17-squashfs3.1/fs/Makefile
---- linux-2.6.17/fs/Makefile 2006-06-18 02:49:35.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/fs/Makefile 2006-08-11 09:33:54.000000000 +0100
-@@ -56,6 +56,7 @@ obj-$(CONFIG_EXT3_FS) += ext3/ # Before
+diff --new-file -urp linux-2.6.18/fs/Makefile linux-2.6.18-squashfs3.1/fs/Makefile
+--- linux-2.6.18/fs/Makefile 2006-08-11 00:03:12.000000000 +0100
++++ linux-2.6.18-squashfs3.1/fs/Makefile 2006-08-21 00:13:12.000000000 +0100
+@@ -57,6 +57,7 @@ obj-$(CONFIG_EXT3_FS) += ext3/ # Before
obj-$(CONFIG_JBD) += jbd/
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 --new-file -urp linux-2.6.17/fs/squashfs/inode.c linux-2.6.17-squashfs3.1/fs/squashfs/inode.c
---- linux-2.6.17/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/fs/squashfs/inode.c 2006-08-20 01:16:02.000000000 +0100
-@@ -0,0 +1,2155 @@
+diff --new-file -urp linux-2.6.18/fs/squashfs/inode.c linux-2.6.18-squashfs3.1/fs/squashfs/inode.c
+--- linux-2.6.18/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/fs/squashfs/inode.c 2006-08-21 00:15:29.000000000 +0100
+@@ -0,0 +1,2152 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+ *
@@ -135,7 +135,7 @@
+#include "squashfs.h"
+
+static void squashfs_put_super(struct super_block *);
-+static int squashfs_statfs(struct super_block *, struct kstatfs *);
++static int squashfs_statfs(struct dentry *, struct kstatfs *);
+static int squashfs_symlink_readpage(struct file *file, struct page *page);
+static int squashfs_readpage(struct file *file, struct page *page);
+static int squashfs_readpage4K(struct file *file, struct page *page);
@@ -150,8 +150,8 @@
+static long long read_blocklist(struct inode *inode, int index,
+ int readahead_blks, char *block_list,
+ unsigned short **block_p, unsigned int *bsize);
-+static struct super_block *squashfs_get_sb(struct file_system_type *, int,
-+ const char *, void *, struct vfsmount *);
++static int squashfs_get_sb(struct file_system_type *, int, const char *, void *,
++ struct vfsmount *);
+
+static struct file_system_type squashfs_fs_type = {
+ .owner = THIS_MODULE,
@@ -694,7 +694,6 @@
+ i->i_fop = &generic_ro_fops;
+ i->i_mode |= S_IFREG;
+ i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+ i->i_blksize = PAGE_CACHE_SIZE;
+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
@@ -747,7 +746,6 @@
+ i->i_fop = &generic_ro_fops;
+ i->i_mode |= S_IFREG;
+ i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+ i->i_blksize = PAGE_CACHE_SIZE;
+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
@@ -1240,9 +1238,9 @@
+}
+
+
-+static int squashfs_statfs(struct super_block *s, struct kstatfs *buf)
++static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+{
-+ struct squashfs_sb_info *msblk = s->s_fs_info;
++ struct squashfs_sb_info *msblk = dentry->d_sb->s_fs_info;
+ struct squashfs_super_block *sblk = &msblk->sblk;
+
+ TRACE("Entered squashfs_statfs\n");
@@ -2010,7 +2008,6 @@
+failed_read:
+ ERROR("Unable to read directory block [%llx:%x]\n", next_block,
+ next_offset);
-+ kfree(dire);
+ return 0;
+}
+
@@ -2158,10 +2155,12 @@
+}
+
+
-+static struct super_block *squashfs_get_sb(struct file_system_type *fs_type,
-+ int flags, const char *dev_name, void *data, struct vfsmount *mnt)
++static int squashfs_get_sb(struct file_system_type *fs_type, int flags,
++ const char *dev_name, void *data,
++ struct vfsmount *mnt)
+{
-+ return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, mnt);
++ return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super,
++ mnt);
+}
+
+
@@ -2232,9 +2231,7 @@
+
+static void destroy_inodecache(void)
+{
-+ if (kmem_cache_destroy(squashfs_inode_cachep))
-+ printk(KERN_INFO "squashfs_inode_cache: not all structures "
-+ "were freed\n");
++ kmem_cache_destroy(squashfs_inode_cachep);
+}
+
+
@@ -2243,9 +2240,9 @@
+MODULE_DESCRIPTION("squashfs 3.1, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip at lougher.org.uk>");
+MODULE_LICENSE("GPL");
-diff --new-file -urp linux-2.6.17/fs/squashfs/Makefile linux-2.6.17-squashfs3.1/fs/squashfs/Makefile
---- linux-2.6.17/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/fs/squashfs/Makefile 2006-08-11 09:33:54.000000000 +0100
+diff --new-file -urp linux-2.6.18/fs/squashfs/Makefile linux-2.6.18-squashfs3.1/fs/squashfs/Makefile
+--- linux-2.6.18/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/fs/squashfs/Makefile 2006-08-21 00:13:12.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@@ -2254,10 +2251,10 @@
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
-diff --new-file -urp linux-2.6.17/fs/squashfs/squashfs2_0.c linux-2.6.17-squashfs3.1/fs/squashfs/squashfs2_0.c
---- linux-2.6.17/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/fs/squashfs/squashfs2_0.c 2006-08-20 01:16:02.000000000 +0100
-@@ -0,0 +1,779 @@
+diff --new-file -urp linux-2.6.18/fs/squashfs/squashfs2_0.c linux-2.6.18-squashfs3.1/fs/squashfs/squashfs2_0.c
+--- linux-2.6.18/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/fs/squashfs/squashfs2_0.c 2006-08-21 00:14:55.000000000 +0100
+@@ -0,0 +1,778 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+ *
@@ -2489,7 +2486,6 @@
+ i->i_atime.tv_sec = inodep->mtime;
+ i->i_ctime.tv_sec = inodep->mtime;
+ i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+ i->i_blksize = PAGE_CACHE_SIZE;
+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
@@ -3037,9 +3033,9 @@
+
+ return 1;
+}
-diff --new-file -urp linux-2.6.17/fs/squashfs/squashfs.h linux-2.6.17-squashfs3.1/fs/squashfs/squashfs.h
---- linux-2.6.17/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/fs/squashfs/squashfs.h 2006-08-11 09:33:54.000000000 +0100
+diff --new-file -urp linux-2.6.18/fs/squashfs/squashfs.h linux-2.6.18-squashfs3.1/fs/squashfs/squashfs.h
+--- linux-2.6.18/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/fs/squashfs/squashfs.h 2006-08-21 00:13:12.000000000 +0100
@@ -0,0 +1,86 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -3127,9 +3123,9 @@
+ return 0;
+}
+#endif
-diff --new-file -urp linux-2.6.17/include/linux/squashfs_fs.h linux-2.6.17-squashfs3.1/include/linux/squashfs_fs.h
---- linux-2.6.17/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/include/linux/squashfs_fs.h 2006-08-11 09:33:54.000000000 +0100
+diff --new-file -urp linux-2.6.18/include/linux/squashfs_fs.h linux-2.6.18-squashfs3.1/include/linux/squashfs_fs.h
+--- linux-2.6.18/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/include/linux/squashfs_fs.h 2006-08-21 00:13:19.000000000 +0100
@@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -4042,9 +4038,9 @@
+
+#endif
+#endif
-diff --new-file -urp linux-2.6.17/include/linux/squashfs_fs_i.h linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_i.h
---- linux-2.6.17/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_i.h 2006-08-11 09:33:54.000000000 +0100
+diff --new-file -urp linux-2.6.18/include/linux/squashfs_fs_i.h linux-2.6.18-squashfs3.1/include/linux/squashfs_fs_i.h
+--- linux-2.6.18/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/include/linux/squashfs_fs_i.h 2006-08-21 00:13:19.000000000 +0100
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -4091,9 +4087,9 @@
+ struct inode vfs_inode;
+};
+#endif
-diff --new-file -urp linux-2.6.17/include/linux/squashfs_fs_sb.h linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_sb.h
---- linux-2.6.17/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_sb.h 2006-08-20 01:16:02.000000000 +0100
+diff --new-file -urp linux-2.6.18/include/linux/squashfs_fs_sb.h linux-2.6.18-squashfs3.1/include/linux/squashfs_fs_sb.h
+--- linux-2.6.18/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-squashfs3.1/include/linux/squashfs_fs_sb.h 2006-08-21 00:16:48.000000000 +0100
@@ -0,0 +1,75 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@ -4170,9 +4166,9 @@
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
-diff --new-file -urp linux-2.6.17/init/do_mounts_rd.c linux-2.6.17-squashfs3.1/init/do_mounts_rd.c
---- linux-2.6.17/init/do_mounts_rd.c 2006-06-18 02:49:35.000000000 +0100
-+++ linux-2.6.17-squashfs3.1/init/do_mounts_rd.c 2006-08-20 01:16:02.000000000 +0100
+diff --new-file -urp linux-2.6.18/init/do_mounts_rd.c linux-2.6.18-squashfs3.1/init/do_mounts_rd.c
+--- linux-2.6.18/init/do_mounts_rd.c 2006-08-11 00:03:15.000000000 +0100
++++ linux-2.6.18-squashfs3.1/init/do_mounts_rd.c 2006-08-21 00:13:19.000000000 +0100
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/squashfs3.1-patch?r1=1.1.4.3&r2=1.1.4.4&f=u
More information about the pld-cvs-commit
mailing list