rpms/kernel/FC-5 kernel-2.6.spec, 1.2258, 1.2259 linux-2.6-squashfs.patch, 1.5, 1.6

Wed Dec 20 19:20:47 UTC 2006

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-squashfs.patch 
Log Message:
reenable squashfs (#220293)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2258
retrieving revision 1.2259
diff -u -r1.2258 -r1.2259

--- kernel-2.6.spec	15 Dec 2006 21:07:29 -0000	1.2258
+++ kernel-2.6.spec	20 Dec 2006 19:20:45 -0000	1.2259
@@ -1645,6 +1645,9 @@
 %endif
 
 %changelog
+* Wed Dec 20 2006 Dave Jones <davej at redhat.com>
+- Reenable squashfs (#220293)
+
 * Fri Dec 15 2006 Dave Jones <davej at redhat.com>
 - 2.6.18.6rc2
 

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.noarch/fs/squashfs/Makefile |    7 
 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, 4271 insertions(+)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-squashfs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-squashfs.patch	13 Dec 2006 18:50:01 -0000	1.5
+++ linux-2.6-squashfs.patch	20 Dec 2006 19:20:45 -0000	1.6
@@ -4220,3 +4220,97 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
+--- linux-2.6.19.noarch/fs/Kconfig~	2006-12-18 18:14:31.000000000 -0500
++++ linux-2.6.19.noarch/fs/Kconfig	2006-12-18 18:16:15.000000000 -0500
+@@ -1401,6 +1401,71 @@ config CRAMFS
+ 
+ 	  If unsure, say N.
+ 
++config SQUASHFS
++       tristate "SquashFS 3.0 - Squashed file system support"
++       select ZLIB_INFLATE
++       help
++         Saying Y here includes support for SquashFS 3.0 (a Compressed Read-Only File
++         System).  Squashfs is a highly compressed read-only filesystem for Linux.
++         It uses zlib compression to compress both files, inodes and directories.
++         Inodes in the system are very small and all blocks are packed to minimise
++         data overhead. Block sizes greater than 4K are supported up to a maximum of 64K.
++         SquashFS 3.0 supports 64 bit filesystems and files (larger than 4GB), full
++         uid/gid information, hard links and timestamps.
++
++         Squashfs is intended for general read-only filesystem use, for archival
++         use (i.e. in cases where a .tar.gz file may be used), and in embedded
++         systems where low overhead is needed.  Further information and filesystem tools
++         are available from http://squashfs.sourceforge.net.
++
++         If you want to compile this as a module ( = code which can be
++         inserted in and removed from the running kernel whenever you want),
++         say M here and read <file:Documentation/modules.txt>.  The module
++         will be called squashfs.  Note that the root file system (the one
++         containing the directory /) cannot be compiled as a module.
++
++         If unsure, say N.
++
++config SQUASHFS_EMBEDDED
++
++       bool "Additional options for memory-constrained systems"
++       depends on SQUASHFS
++       default n
++       help
++         Saying Y here allows you to specify cache sizes and how Squashfs
++         allocates memory.  This is only intended for memory constrained
++         systems.
++
++         If unsure, say N.
++
++config SQUASHFS_FRAGMENT_CACHE_SIZE
++       int "Number of fragments cached" if SQUASHFS_EMBEDDED
++       depends on SQUASHFS
++       default "3"
++       help
++         By default SquashFS caches the last 3 fragments read from
++         the filesystem.  Increasing this amount may mean SquashFS
++         has to re-read fragments less often from disk, at the expense
++         of extra system memory.  Decreasing this amount will mean
++         SquashFS uses less memory at the expense of extra reads from disk.
++
++         Note there must be at least one cached fragment.  Anything
++         much more than three will probably not make much difference.
++
++config SQUASHFS_VMALLOC
++       bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED
++       depends on SQUASHFS
++       default n
++       help
++         By default SquashFS uses kmalloc to obtain fragment cache memory.
++         Kmalloc memory is the standard kernel allocator, but it can fail
++         on memory constrained systems.  Because of the way Vmalloc works,
++         Vmalloc can succeed when kmalloc fails.  Specifying this option
++         will make SquashFS always use Vmalloc to allocate the
++         fragment cache memory.
++
++         If unsure, say N.
++
+ config VXFS_FS
+ 	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
+ 	depends on BLOCK
+--- linux-2.6.19.noarch/fs/Makefile~	2006-12-18 18:16:23.000000000 -0500
++++ linux-2.6.19.noarch/fs/Makefile	2006-12-18 18:16:55.000000000 -0500
+@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD)		+= jbd/
+ obj-$(CONFIG_JBD2)		+= jbd2/
+ obj-$(CONFIG_EXT2_FS)		+= ext2/
+ obj-$(CONFIG_CRAMFS)		+= cramfs/
++obj-$(CONFIG_SQUASHFS)		+= squashfs/
+ 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.
++#
++
++obj-$(CONFIG_SQUASHFS) += squashfs.o
++squashfs-y += inode.o
++squashfs-y += squashfs2_0.o


