Initial revision

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 1791 insertions, 0 deletions

diff --git a/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch b/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch
new file mode 100644
index 000000000..67223f012
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch
@@ -0,0 +1,1791 @@
+diff -urN src/linux-dist/linux/Makefile src/linux/linux/Makefile
+--- src/linux-dist/linux/Makefile	2003-10-14 03:00:10.000000000 -0500
++++ src/linux/linux/Makefile	2004-03-29 17:00:53.000000000 -0600
+@@ -17,7 +17,7 @@
+ FINDHPATH	= $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
+ 
+ HOSTCC  	= gcc
+-HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
++HOSTCFLAGS	= -Wall -Wstrict-prototypes -Os -fomit-frame-pointer
+ 
+ CROSS_COMPILE 	=
+ 
+@@ -88,7 +88,7 @@
+ 
+ CPPFLAGS := -D__KERNEL__ -I$(HPATH)
+ 
+-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
++CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
+ 	  -fno-strict-aliasing -fno-common
+ 
+ # Turn on -pg to instrument the kernel with calls to mcount().
+diff -urN src/linux-dist/linux/arch/mips/brcm-boards/bcm947xx/setup.c src/linux/linux/arch/mips/brcm-boards/bcm947xx/setup.c
+--- src/linux-dist/linux/arch/mips/brcm-boards/bcm947xx/setup.c	2003-11-11 08:08:46.000000000 -0600
++++ src/linux/linux/arch/mips/brcm-boards/bcm947xx/setup.c	2004-03-29 17:00:53.000000000 -0600
+@@ -27,6 +27,7 @@
+ #include <linux/ext2_fs.h>
+ #include <linux/romfs_fs.h>
+ #include <linux/cramfs_fs.h>
++#include <linux/squashfs_fs.h>
+ #endif
+ 
+ #include <typedefs.h>
+@@ -160,37 +161,38 @@
+ #ifdef CONFIG_MTD_PARTITIONS
+ 
+ static struct mtd_partition bcm947xx_parts[] = {
+-	{ name: "pmon",	offset: 0, size: 0, /*mask_flags: MTD_WRITEABLE,*/ },
++	{ name: "pmon",	offset: 0, size: 0, mask_flags: MTD_WRITEABLE, },
+ 	{ name: "linux", offset: 0, size: 0, },
+ 	{ name: "rootfs", offset: 0, size: 0, /*mask_flags: MTD_WRITEABLE,*/ },
+ 	{ name: "nvram", offset: 0, size: 0, },
++	{ name: "OpenWrt", offset: 0, size: 0, },
+ 	{ name: NULL, },
+ };
+ 
+-struct mtd_partition * __init
+-init_mtd_partitions(struct mtd_info *mtd, size_t size)
++
++static int __init
++find_root(struct mtd_info *mtd, size_t size, struct mtd_partition *part)
+ {
+-	struct minix_super_block *minixsb;
+-	struct ext2_super_block *ext2sb;
+-	struct romfs_super_block *romfsb;
+ 	struct cramfs_super *cramfsb;
++	struct squashfs_super_block *squashfsb;
+ 	struct trx_header *trx;
++
+ 	unsigned char buf[512];
+ 	int off;
+ 	size_t len;
+ 
+-	minixsb = (struct minix_super_block *) buf;
+-	ext2sb = (struct ext2_super_block *) buf;
+-	romfsb = (struct romfs_super_block *) buf;
+ 	cramfsb = (struct cramfs_super *) buf;
++	squashfsb = (struct squashfs_super_block *) buf;
+ 	trx = (struct trx_header *) buf;
+ 
+-	/* Look at every 64 KB boundary */
+-	for (off = 0; off < size; off += (64 * 1024)) {
++	part->offset = 0;
++	part->size = 0;
++
++	for (off = 0; off < size; off += mtd->erasesize) {
+ 		memset(buf, 0xe5, sizeof(buf));
+ 
+ 		/*
+-		 * Read block 0 to test for romfs and cramfs superblock
++		 * Read block 0 to test for cramfs superblock
+ 		 */
+ 		if (MTD_READ(mtd, off, sizeof(buf), &len, buf) ||
+ 		    len != sizeof(buf))
+@@ -198,75 +200,105 @@
+ 
+ 		/* Try looking at TRX header for rootfs offset */
+ 		if (le32_to_cpu(trx->magic) == TRX_MAGIC) {
+-			bcm947xx_parts[1].offset = off;
+ 			if (le32_to_cpu(trx->offsets[1]) > off)
+ 				off = le32_to_cpu(trx->offsets[1]);
+ 			continue;
+ 		}
+ 
+-		/* romfs is at block zero too */
+-		if (romfsb->word0 == ROMSB_WORD0 &&
+-		    romfsb->word1 == ROMSB_WORD1) {
+-			printk(KERN_NOTICE
+-			       "%s: romfs filesystem found at block %d\n",
+-			       mtd->name, off / BLOCK_SIZE);
+-			goto done;
+-		}
+-
+-		/* so is cramfs */
++		/* need to find cramfs */
+ 		if (cramfsb->magic == CRAMFS_MAGIC) {
+ 			printk(KERN_NOTICE
+ 			       "%s: cramfs filesystem found at block %d\n",
+ 			       mtd->name, off / BLOCK_SIZE);
+-			goto done;
+-		}
+-
+-		/*
+-		 * Read block 1 to test for minix and ext2 superblock
+-		 */
+-		if (MTD_READ(mtd, off + BLOCK_SIZE, sizeof(buf), &len, buf) ||
+-		    len != sizeof(buf))
+-			continue;
+ 
+-		/* Try minix */
+-		if (minixsb->s_magic == MINIX_SUPER_MAGIC ||
+-		    minixsb->s_magic == MINIX_SUPER_MAGIC2) {
+-			printk(KERN_NOTICE
+-			       "%s: Minix filesystem found at block %d\n",
+-			       mtd->name, off / BLOCK_SIZE);
++			part->size = cramfsb->size;
+ 			goto done;
+ 		}
+ 
+-		/* Try ext2 */
+-		if (ext2sb->s_magic == cpu_to_le16(EXT2_SUPER_MAGIC)) {
++		/* or squashfs */
++		if (squashfsb->s_magic == SQUASHFS_MAGIC) {
+ 			printk(KERN_NOTICE
+-			       "%s: ext2 filesystem found at block %d\n",
++				"%s: squashfs filesystem found at block %d\n",
+ 			       mtd->name, off / BLOCK_SIZE);
++			part->size = squashfsb->bytes_used+2048;
+ 			goto done;
+ 		}
+-	}
+ 
++	}
+ 	printk(KERN_NOTICE
+-	       "%s: Couldn't find valid ROM disk image\n",
++	       "%s: Couldn't find valid cramfs image\n",
+ 	       mtd->name);
++	return -1;
++	
++done:
++	part->offset = off;
++	return 0;
++}
++
++
++struct mtd_partition * __init
++init_mtd_partitions(struct mtd_info *mtd, size_t size)
++{
++
++	bcm947xx_parts[0].offset=0;
++	bcm947xx_parts[0].size=256*1024;
+ 
+- done:
+ 	/* Find and size nvram */
+ 	bcm947xx_parts[3].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
+ 	bcm947xx_parts[3].size = size - bcm947xx_parts[3].offset;
+ 
+ 	/* Find and size rootfs */
+-	if (off < size) {
+-		bcm947xx_parts[2].offset = off;
+-		bcm947xx_parts[2].size = bcm947xx_parts[3].offset - bcm947xx_parts[2].offset;
+-	}
++	//if (off < size) {
++	//	bcm947xx_parts[2].offset = off;
++	//	bcm947xx_parts[2].size = bcm947xx_parts[3].offset - bcm947xx_parts[2].offset;
++	//}
++
++	/* Find and size rootfs */
++	find_root(mtd,size,&bcm947xx_parts[2]);
++	
++
+ 
+ 	/* Size linux (kernel and rootfs) */
++	bcm947xx_parts[1].offset = bcm947xx_parts[0].size;
+ 	bcm947xx_parts[1].size = bcm947xx_parts[3].offset - bcm947xx_parts[1].offset;
+ 
++
++
++	/* calculate leftover flash, and assign it to the jffs partition */
++	size_t spot;
++	size_t len;
++	size_t mask;
++	//  get the offset to the end of the root_fs
++	spot=bcm947xx_parts[2].offset+bcm947xx_parts[2].size;
++	//  round it up to an erase size boundary
++    spot+=mtd->erasesize-1;
++	//  mask the number to the boundary
++	mask=mtd->erasesize;
++	mask=mask-1;
++	mask=mask^0xffffffff;
++	spot&=mask;
++	//  length = flashsize - start position - nvram size
++	len=size-spot;
++	len=len-bcm947xx_parts[3].size;
++	
++
++	bcm947xx_parts[4].offset = spot;
++	bcm947xx_parts[4].size = len;
++
++
++
++
+ 	/* Size pmon */
+ 	bcm947xx_parts[0].size = bcm947xx_parts[1].offset - bcm947xx_parts[0].offset;
+ 
++	//int x;
++	//for(x=0; x<5; x++) {
++	//	printk(KERN_NOTICE
++	//		   "Partition %d mask_flags %08x\n",
++	//		   x,bcm947xx_parts[x].mask_flags);
++	//}
++
++
+ 	return bcm947xx_parts;
+ }
+ 
+diff -urN src/linux-dist/linux/drivers/mtd/maps/bcm947xx-flash.c src/linux/linux/drivers/mtd/maps/bcm947xx-flash.c
+--- src/linux-dist/linux/drivers/mtd/maps/bcm947xx-flash.c	2003-11-08 03:35:52.000000000 -0600
++++ src/linux/linux/drivers/mtd/maps/bcm947xx-flash.c	2004-03-29 17:00:53.000000000 -0600
+@@ -82,7 +82,21 @@
+ 
+ void bcm947xx_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
+ {
++	//memcpy_fromio(to, map->map_priv_1 + from, len);
++	if (len==1) {
+ 	memcpy_fromio(to, map->map_priv_1 + from, len);
++	} else {
++		int i;
++		u16 *dest = (u16 *) to;
++		u16 *src  = (u16 *) (map->map_priv_1 + from);
++
++		for (i = 0; i < (len / 2); i++) {
++			dest[i] = src[i];
++		}
++
++		if (len & 1)
++			*((u8 *)dest+len-1) = src[i] & 0xff;
++	}
+ }
+ 
+ void bcm947xx_map_write8(struct map_info *map, __u8 d, unsigned long adr)
+diff -urN src/linux-dist/linux/drivers/net/Makefile src/linux/linux/drivers/net/Makefile
+--- src/linux-dist/linux/drivers/net/Makefile	2004-02-12 20:35:15.000000000 -0600
++++ src/linux/linux/drivers/net/Makefile	2004-03-29 17:00:53.000000000 -0600
+@@ -25,7 +25,7 @@
+ list-multi	:=	rcpci.o
+ rcpci-objs	:=	rcpci45.o rclanmtl.o
+ 
+-subdir-m += mac
++# subdir-m += mac
+ subdir-m += diag
+ 
+ ifeq ($(CONFIG_HW_QOS),y)
+diff -urN src/linux-dist/linux/fs/Config.in src/linux/linux/fs/Config.in
+--- src/linux-dist/linux/fs/Config.in	2003-07-04 03:12:05.000000000 -0500
++++ src/linux/linux/fs/Config.in	2004-03-29 17:00:53.000000000 -0600
+@@ -47,6 +47,7 @@
+    int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
+ fi
+ tristate 'Compressed ROM file system support' CONFIG_CRAMFS
++tristate 'Squashed file system support' CONFIG_SQUASHFS
+ bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
+ define_bool CONFIG_RAMFS y
+ 
+diff -urN src/linux-dist/linux/fs/Makefile src/linux/linux/fs/Makefile
+--- src/linux-dist/linux/fs/Makefile	2003-07-04 03:12:05.000000000 -0500
++++ src/linux/linux/fs/Makefile	2004-03-29 17:00:53.000000000 -0600
+@@ -68,6 +68,7 @@
+ subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
+ subdir-$(CONFIG_BEFS_FS)	+= befs
+ subdir-$(CONFIG_JFS_FS)		+= jfs
++subdir-$(CONFIG_SQUASHFS)	+= squashfs
+ 
+ 
+ obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o
+diff -urN src/linux-dist/linux/fs/squashfs/Makefile src/linux/linux/fs/squashfs/Makefile
+--- src/linux-dist/linux/fs/squashfs/Makefile	1969-12-31 18:00:00.000000000 -0600
++++ src/linux/linux/fs/squashfs/Makefile	2004-03-29 17:00:53.000000000 -0600
+@@ -0,0 +1,11 @@
++#
++# Makefile for the linux squashfs routines.
++#
++
++O_TARGET := squashfs.o
++
++obj-y  := inode.o
++
++obj-m := $(O_TARGET)
++
++include $(TOPDIR)/Rules.make
+diff -urN src/linux-dist/linux/fs/squashfs/inode.c src/linux/linux/fs/squashfs/inode.c
+--- src/linux-dist/linux/fs/squashfs/inode.c	1969-12-31 18:00:00.000000000 -0600
++++ src/linux/linux/fs/squashfs/inode.c	2004-03-29 17:00:53.000000000 -0600
+@@ -0,0 +1,972 @@
++/*
++ * Squashfs - a compressed read only filesystem for Linux
++ *
++ * Copyright (c) 2002 Phillip Lougher <phillip@lougher.demon.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ * inode.c
++ */
++
++#include <linux/types.h>
++#include <linux/squashfs_fs.h>
++#include <linux/module.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/fs.h>
++#include <linux/locks.h>
++#include <linux/init.h>
++#include <linux/dcache.h>
++#include <asm/uaccess.h>
++#include <linux/wait.h>
++#include <asm/semaphore.h>
++
++#include <linux/zlib.h>
++#include <linux/blkdev.h>
++#include <linux/vmalloc.h>
++
++#ifdef SQUASHFS_TRACE
++#define TRACE(s, args...)				printk(KERN_NOTICE "SQUASHFS: "s, ## args)
++#else
++#define TRACE(s, args...)				{}
++#endif
++
++#define ERROR(s, args...)				printk(KERN_ERR "SQUASHFS error: "s, ## args)
++
++#define SERROR(s, args...)				if(!silent) printk(KERN_ERR "SQUASHFS error: "s, ## args)
++#define WARNING(s, args...)				printk(KERN_WARNING "SQUASHFS: "s, ## args)
++
++static struct super_block *squashfs_read_super(struct super_block *, void *, int);
++static void squashfs_put_super(struct super_block *);
++static int squashfs_statfs(struct super_block *, struct statfs *);
++static int squashfs_symlink_readpage(struct file *file, struct page *page);
++static int squashfs_readpage(struct file *file, struct page *page);
++static int squashfs_readdir(struct file *, void *, filldir_t);
++static struct dentry *squashfs_lookup(struct inode *, struct dentry *);
++static unsigned int read_data(struct super_block *s, char *buffer,
++		unsigned int index, int length, unsigned int *next_index);
++static int squashfs_get_cached_block(struct super_block *s, char *buffer,
++		unsigned int block, unsigned int offset, int length,
++		unsigned int *next_block, unsigned int *next_offset);
++static struct inode *squashfs_iget(struct super_block *s, squashfs_inode inode);
++static void squashfs_put_super(struct super_block *s);
++
++DECLARE_MUTEX(read_data_mutex);
++
++static z_stream stream;
++
++static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super);
++
++static unsigned char squashfs_filetype_table[] = {
++	DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
++};
++
++static struct super_operations squashfs_ops = {
++	statfs: squashfs_statfs,
++	put_super: squashfs_put_super,
++};
++
++static struct address_space_operations squashfs_symlink_aops = {
++	readpage: squashfs_symlink_readpage
++};
++
++static struct address_space_operations squashfs_aops = {
++	readpage: squashfs_readpage
++};
++
++static struct file_operations squashfs_dir_ops = {
++	read: generic_read_dir,
++	readdir: squashfs_readdir
++};
++
++static struct inode_operations squashfs_dir_inode_ops = {
++	lookup: squashfs_lookup
++};
++
++
++static unsigned int read_data(struct super_block *s, char *buffer,
++		unsigned int index, int length, unsigned int *next_index)
++{
++	squashfs_sb_info *msBlk = &s->u.squashfs_sb;
++	struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >> msBlk->devblksize_log2) + 2];
++	unsigned short c_byte;
++	unsigned int offset = index & ((1 << msBlk->devblksize_log2) - 1);
++	unsigned int cur_index = index >> msBlk->devblksize_log2;
++	int bytes, avail_bytes, b, k;
++	char *c_buffer;
++	unsigned int compressed;
++
++	if(!(bh[0] = sb_bread(s, cur_index)))
++		goto read_failure;
++
++	if(length)
++		c_byte = length;
++	else {
++		if(msBlk->devblksize - offset == 1) {
++			if(msBlk->swap)
++				((unsigned char *) &c_byte)[1] = *((unsigned char *) (bh[0]->b_data + offset));
++			else
++				((unsigned char *) &c_byte)[0] = *((unsigned char *) (bh[0]->b_data + offset));
++			brelse(bh[0]);
++			if(!(bh[0] = sb_bread(s, ++cur_index)))
++				goto read_failure;
++			if(msBlk->swap)
++				((unsigned char *) &c_byte)[0] = *((unsigned char *) bh[0]->b_data); 
++			else
++				((unsigned char *) &c_byte)[1] = *((unsigned char *) bh[0]->b_data); 
++			offset = 1;
++		}
++		else {
++			if(msBlk->swap) {
++				((unsigned char *) &c_byte)[1] = *((unsigned char *) (bh[0]->b_data + offset));
++				((unsigned char *) &c_byte)[0] = *((unsigned char *) (bh[0]->b_data + offset + 1)); 
++			} else
++				c_byte = *((unsigned short *) (bh[0]->b_data + offset));
++			offset += 2;
++		}
++		if(SQUASHFS_CHECK_DATA(msBlk->sBlk.flags)) {
++			if(offset == msBlk->devblksize) {
++				brelse(bh[0]);
++				if(!(bh[0] = sb_bread(s, ++cur_index)))
++					goto read_failure;
++				offset = 0;
++			}
++			if(*((unsigned char *) (bh[0]->b_data + offset)) != SQUASHFS_MARKER_BYTE) {
++				ERROR("Metadata block marker corrupt @ %x\n", index);
++				brelse(bh[0]);
++				return 0;
++			}
++			offset ++;
++		}
++	}
++
++	bytes = msBlk->devblksize - offset;
++	c_buffer = (compressed = SQUASHFS_COMPRESSED(c_byte)) ? msBlk->read_data : buffer;
++	c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
++
++	TRACE("Block @ 0x%x, %scompressed size %d\n", index, compressed ? "" : "un", (unsigned int) c_byte);
++
++	for(b = 1; bytes < c_byte; b++) {
++		if(!(bh[b] = sb_bread(s, ++cur_index)))
++			goto block_release;
++		bytes += msBlk->devblksize;
++	}
++
++	if(compressed)
++		down(&read_data_mutex);
++
++	for(bytes = 0, k = 0; k < b; k++) {
++		avail_bytes = (c_byte - bytes) > (msBlk->devblksize - offset) ? msBlk->devblksize - offset : c_byte - bytes;
++		memcpy(c_buffer + bytes, bh[k]->b_data + offset, avail_bytes);
++		bytes += avail_bytes;
++		offset = 0;
++		brelse(bh[k]);
++	}
++
++	/*
++	 * uncompress block
++	 */
++	if(compressed) {
++		int zlib_err;
++
++		stream.next_in = c_buffer;
++		stream.avail_in = c_byte;
++		stream.next_out = buffer;
++		stream.avail_out = msBlk->read_size;
++		if(((zlib_err = zlib_inflateInit(&stream)) != Z_OK) ||
++				((zlib_err = zlib_inflate(&stream, Z_FINISH)) != Z_STREAM_END) ||
++				((zlib_err = zlib_inflateEnd(&stream)) != Z_OK)) {
++			ERROR("zlib_fs returned unexpected result 0x%x\n", zlib_err);
++			bytes = 0;
++		} else
++			bytes = stream.total_out;
++		up(&read_data_mutex);
++	}
++
++	if(next_index)
++		*next_index = index + c_byte + (length ? 0 : (SQUASHFS_CHECK_DATA(msBlk->sBlk.flags) ? 3 : 2));
++
++	return bytes;
++
++block_release:
++	while(--b >= 0) brelse(bh[b]);
++
++read_failure:
++	ERROR("sb_bread failed reading block 0x%x\n", cur_index);
++	return 0;
++}
++
++
++static int squashfs_get_cached_block(struct super_block *s, char *buffer,
++		unsigned int block, unsigned int offset, int length,
++		unsigned int *next_block, unsigned int *next_offset)
++{
++	squashfs_sb_info *msBlk = &s->u.squashfs_sb;
++	int n, i, bytes, return_length = length;
++	unsigned int next_index;
++
++	TRACE("Entered squashfs_get_cached_block [%x:%x]\n", block, offset);
++
++	for(;;) {
++		for(i = 0; i < SQUASHFS_CACHED_BLKS; i++) 
++			if(msBlk->block_cache[i].block == block)
++				break; 
++		
++		down(&msBlk->block_cache_mutex);
++		if(i == SQUASHFS_CACHED_BLKS) {
++			/* read inode header block */
++			for(i = msBlk->next_cache, n = SQUASHFS_CACHED_BLKS; n ; n --, i = (i + 1) % SQUASHFS_CACHED_BLKS)
++				if(msBlk->block_cache[i].block != SQUASHFS_USED_BLK)
++					break;
++			if(n == 0) {
++				up(&msBlk->block_cache_mutex);
++				sleep_on(&msBlk->waitq);
++				continue;
++			}
++			msBlk->next_cache = (i + 1) % SQUASHFS_CACHED_BLKS;
++
++			if(msBlk->block_cache[i].block == SQUASHFS_INVALID_BLK) {
++				if(!(msBlk->block_cache[i].data = (unsigned char *)
++							kmalloc(SQUASHFS_METADATA_SIZE, GFP_KERNEL))) {
++					ERROR("Failed to allocate cache block\n");
++					up(&msBlk->block_cache_mutex);
++					return 0;
++				}
++			}
++	
++			msBlk->block_cache[i].block = SQUASHFS_USED_BLK;
++			up(&msBlk->block_cache_mutex);
++			if(!(msBlk->block_cache[i].length = read_data(s, msBlk->block_cache[i].data, block, 0,
++							&next_index))) {
++				ERROR("Unable to read cache block [%x:%x]\n", block, offset);
++				return 0;
++			}
++			down(&msBlk->block_cache_mutex);
++			wake_up(&msBlk->waitq);
++			msBlk->block_cache[i].block = block;
++			msBlk->block_cache[i].next_index = next_index;
++			TRACE("Read cache block [%x:%x]\n", block, offset);
++		}
++
++		if(msBlk->block_cache[i].block != block) {
++			up(&msBlk->block_cache_mutex);
++			continue;
++		}
++
++		if((bytes = msBlk->block_cache[i].length - offset) >= length) {
++			if(buffer)
++				memcpy(buffer, msBlk->block_cache[i].data + offset, length);
++			if(msBlk->block_cache[i].length - offset == length) {
++				*next_block = msBlk->block_cache[i].next_index;
++				*next_offset = 0;
++			} else {
++				*next_block = block;
++				*next_offset = offset + length;
++			}
++	
++			up(&msBlk->block_cache_mutex);
++			return return_length;
++		} else {
++			if(buffer) {
++				memcpy(buffer, msBlk->block_cache[i].data + offset, bytes);
++				buffer += bytes;
++			}
++			block = msBlk->block_cache[i].next_index;
++			up(&msBlk->block_cache_mutex);
++			length -= bytes;
++			offset = 0;
++		}
++	}
++}
++
++
++static struct inode *squashfs_iget(struct super_block *s, squashfs_inode inode)
++{
++	struct inode *i = new_inode(s);
++	squashfs_sb_info *msBlk = &s->u.squashfs_sb;
++	squashfs_super_block *sBlk = &msBlk->sBlk;
++	unsigned int block = SQUASHFS_INODE_BLK(inode) + sBlk->inode_table_start;
++	unsigned int offset = SQUASHFS_INODE_OFFSET(inode);
++	unsigned int next_block, next_offset;
++	squashfs_base_inode_header inodeb;
++
++	TRACE("Entered squashfs_iget\n");
++
++	if(msBlk->swap) {
++		squashfs_base_inode_header sinodeb;
++
++		if(!squashfs_get_cached_block(s, (char *) &sinodeb, block,  offset,
++					sizeof(sinodeb), &next_block, &next_offset))
++			goto failed_read;
++		SQUASHFS_SWAP_BASE_INODE_HEADER(&inodeb, &sinodeb, sizeof(sinodeb));
++	} else
++		if(!squashfs_get_cached_block(s, (char *) &inodeb, block,  offset,
++					sizeof(inodeb), &next_block, &next_offset))
++			goto failed_read;
++
++	i->i_nlink = 1;
++
++	i->i_mtime = sBlk->mkfs_time;
++	i->i_atime = sBlk->mkfs_time;
++	i->i_ctime = sBlk->mkfs_time;
++
++	if(inodeb.inode_type != SQUASHFS_IPC_TYPE)
++		i->i_uid = msBlk->uid[((inodeb.inode_type - 1) / SQUASHFS_TYPES) * 16 + inodeb.uid];
++	i->i_ino = SQUASHFS_MK_VFS_INODE(block - sBlk->inode_table_start, offset);
++
++	i->i_mode = inodeb.mode;
++
++	switch(inodeb.inode_type == SQUASHFS_IPC_TYPE ? SQUASHFS_IPC_TYPE : (inodeb.inode_type - 1) % SQUASHFS_TYPES + 1) {
++		case SQUASHFS_FILE_TYPE: {
++			squashfs_reg_inode_header inodep;
++
++			if(msBlk->swap) {
++				squashfs_reg_inode_header sinodep;
++
++				if(!squashfs_get_cached_block(s, (char *) &sinodep, block,  offset, sizeof(sinodep),
++							&next_block, &next_offset))
++					goto failed_read;
++				SQUASHFS_SWAP_REG_INODE_HEADER(&inodep, &sinodep);
++			} else
++				if(!squashfs_get_cached_block(s, (char *) &inodep, block,  offset, sizeof(inodep),
++							&next_block, &next_offset))
++					goto failed_read;
++
++			i->i_size = inodep.file_size;
++			i->i_fop = &generic_ro_fops;
++			i->i_data.a_ops = &squashfs_aops;
++			i->i_mode |= S_IFREG;
++			i->i_mtime = inodep.mtime;
++			i->i_atime = inodep.mtime;
++			i->i_ctime = inodep.mtime;
++			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
++			i->i_blksize = PAGE_CACHE_SIZE;
++			i->u.squashfs_i.start_block = inodep.start_block;
++			i->u.squashfs_i.block_list_start = next_block;
++			i->u.squashfs_i.offset = next_offset;
++			TRACE("File inode %x:%x, start_block %x, block_list_start %x, offset %x\n",
++					SQUASHFS_INODE_BLK(inode), offset, inodep.start_block, next_block, next_offset);
++			break;
++		}
++		case SQUASHFS_DIR_TYPE: {
++			squashfs_dir_inode_header inodep;
++
++			if(msBlk->swap) {
++				squashfs_dir_inode_header sinodep;
++
++				if(!squashfs_get_cached_block(s, (char *) &sinodep, block,  offset, sizeof(sinodep),
++							&next_block, &next_offset))
++					goto failed_read;
++				SQUASHFS_SWAP_DIR_INODE_HEADER(&inodep, &sinodep);
++			} else
++				if(!squashfs_get_cached_block(s, (char *) &inodep, block,  offset, sizeof(inodep),
++							&next_block, &next_offset))
++					goto failed_read;
++
++			i->i_size = inodep.file_size;
++			i->i_op = &squashfs_dir_inode_ops;
++			i->i_fop = &squashfs_dir_ops;
++			i->i_mode |= S_IFDIR;
++			i->i_mtime = inodep.mtime;
++			i->i_atime = inodep.mtime;
++			i->i_ctime = inodep.mtime;
++			i->u.squashfs_i.start_block = inodep.start_block;
++			i->u.squashfs_i.offset = inodep.offset;
++			TRACE("Directory inode %x:%x, start_block %x, offset %x\n", SQUASHFS_INODE_BLK(inode), offset,
++					inodep.start_block, inodep.offset);
++			break;
++		}
++		case SQUASHFS_SYMLINK_TYPE: {
++			squashfs_symlink_inode_header inodep;
++	
++			if(msBlk->swap) {
++				squashfs_symlink_inode_header sinodep;
++
++				if(!squashfs_get_cached_block(s, (char *) &sinodep, block,  offset, sizeof(sinodep),
++							&next_block, &next_offset))
++					goto failed_read;
++				SQUASHFS_SWAP_SYMLINK_INODE_HEADER(&inodep, &sinodep);
++			} else
++				if(!squashfs_get_cached_block(s, (char *) &inodep, block,  offset, sizeof(inodep),
++							&next_block, &next_offset))
++					goto failed_read;
++
++			i->i_size = inodep.symlink_size;
++			i->i_op = &page_symlink_inode_operations;
++			i->i_data.a_ops = &squashfs_symlink_aops;
++			i->i_mode |= S_IFLNK;
++			i->u.squashfs_i.start_block = next_block;
++			i->u.squashfs_i.offset = next_offset;
++			TRACE("Symbolic link inode %x:%x, start_block %x, offset %x\n",
++				SQUASHFS_INODE_BLK(inode), offset, next_block, next_offset);
++			break;
++		 }
++		 case SQUASHFS_BLKDEV_TYPE:
++		 case SQUASHFS_CHRDEV_TYPE: {
++			squashfs_dev_inode_header inodep;
++
++			if(msBlk->swap) {
++				squashfs_dev_inode_header sinodep;
++
++				if(!squashfs_get_cached_block(s, (char *) &sinodep, block,  offset, sizeof(sinodep),
++							&next_block, &next_offset))
++					goto failed_read;
++				SQUASHFS_SWAP_DEV_INODE_HEADER(&inodep, &sinodep);
++			} else	
++				if(!squashfs_get_cached_block(s, (char *) &inodep, block,  offset, sizeof(inodep),
++							&next_block, &next_offset))
++					goto failed_read;
++
++			i->i_size = 0;
++			i->i_mode |= (inodeb.inode_type == SQUASHFS_CHRDEV_TYPE) ? S_IFCHR : S_IFBLK;
++			init_special_inode(i, i->i_mode, inodep.rdev);
++			TRACE("Device inode %x:%x, rdev %x\n", SQUASHFS_INODE_BLK(inode), offset, inodep.rdev);
++			break;
++		 }
++		 case SQUASHFS_IPC_TYPE: {
++			squashfs_ipc_inode_header inodep;
++
++			if(msBlk->swap) {
++				squashfs_ipc_inode_header sinodep;
++
++				if(!squashfs_get_cached_block(s, (char *) &sinodep, block,  offset, sizeof(sinodep),
++							&next_block, &next_offset))
++					goto failed_read;
++				SQUASHFS_SWAP_IPC_INODE_HEADER(&inodep, &sinodep);
++			} else	
++				if(!squashfs_get_cached_block(s, (char *) &inodep, block,  offset, sizeof(inodep),
++							&next_block, &next_offset))
++					goto failed_read;
++
++			i->i_size = 0;
++			i->i_mode |= (inodep.type == SQUASHFS_FIFO_TYPE) ? S_IFIFO : S_IFSOCK;
++			i->i_uid = msBlk->uid[inodep.offset * 16 + inodeb.uid];
++			init_special_inode(i, i->i_mode, 0);
++			break;
++		 }
++		 default:
++			ERROR("Unknown inode type %d in squashfs_iget!\n", inodeb.inode_type);
++				goto failed_read1;
++	}
++	
++	if(inodeb.guid == SQUASHFS_GUIDS)
++		i->i_gid = i->i_uid;
++	else
++		i->i_gid = msBlk->guid[inodeb.guid];
++
++	return i;
++
++failed_read:
++	ERROR("Unable to read inode [%x:%x]\n", block, offset);
++
++failed_read1:
++	return NULL;
++}
++
++
++static struct super_block *squashfs_read_super(struct super_block *s,
++		void *data, int silent)
++{
++	kdev_t dev = s->s_dev;
++	squashfs_sb_info *msBlk = &s->u.squashfs_sb;
++	squashfs_super_block *sBlk = &msBlk->sBlk;
++	int i;
++
++	TRACE("Entered squashfs_read_superblock\n");
++
++	msBlk->devblksize = get_hardsect_size(dev);
++	if(msBlk->devblksize < BLOCK_SIZE)
++		msBlk->devblksize = BLOCK_SIZE;
++	msBlk->devblksize_log2 = ffz(~msBlk->devblksize);
++	set_blocksize(dev, msBlk->devblksize);
++	s->s_blocksize = msBlk->devblksize;
++	s->s_blocksize_bits = msBlk->devblksize_log2;
++
++	init_MUTEX(&msBlk->read_page_mutex);
++	init_MUTEX(&msBlk->block_cache_mutex);
++	
++	init_waitqueue_head(&msBlk->waitq);
++
++	if(!read_data(s, (char *) sBlk, SQUASHFS_START, sizeof(squashfs_super_block) | SQUASHFS_COMPRESSED_BIT, NULL)) {
++		SERROR("unable to read superblock\n");
++		goto failed_mount;
++	}
++
++	/* Check it is a SQUASHFS superblock */
++	msBlk->swap = 0;
++	if((s->s_magic = sBlk->s_magic) != SQUASHFS_MAGIC) {
++		if(sBlk->s_magic == SQUASHFS_MAGIC_SWAP) {
++			squashfs_super_block sblk;
++			WARNING("Mounting a different endian SQUASHFS filesystem on %s\n", bdevname(dev));
++			SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk);
++			memcpy(sBlk, &sblk, sizeof(squashfs_super_block));
++			msBlk->swap = 1;
++		} else  {
++			SERROR("Can't find a SQUASHFS superblock on %s\n", bdevname(dev));
++			goto failed_mount;
++		}
++	}
++
++	/* Check the MAJOR & MINOR versions */
++	if(sBlk->s_major != SQUASHFS_MAJOR || sBlk->s_minor > SQUASHFS_MINOR) {
++		SERROR("Major/Minor mismatch, filesystem is (%d:%d), I support (%d: <= %d)\n",
++				sBlk->s_major, sBlk->s_minor, SQUASHFS_MAJOR, SQUASHFS_MINOR);
++		goto failed_mount;
++	}
++
++	TRACE("Found valid superblock on %s\n", bdevname(dev));
++	TRACE("Inodes are %scompressed\n", SQUASHFS_UNCOMPRESSED_INODES(sBlk->flags) ? "un" : "");
++	TRACE("Data is %scompressed\n", SQUASHFS_UNCOMPRESSED_DATA(sBlk->flags) ? "un" : "");
++	TRACE("Check data is %s present in the filesystem\n", SQUASHFS_CHECK_DATA(sBlk->flags) ? "" : "not");
++	TRACE("Filesystem size %d bytes\n", sBlk->bytes_used);
++	TRACE("Block size %d\n", sBlk->block_size);
++	TRACE("Number of inodes %d\n", sBlk->inodes);
++	TRACE("Number of uids %d\n", sBlk->no_uids);
++	TRACE("Number of gids %d\n", sBlk->no_guids);
++	TRACE("sBlk->inode_table_start %x\n", sBlk->inode_table_start);
++	TRACE("sBlk->directory_table_start %x\n", sBlk->directory_table_start);
++	TRACE("sBlk->uid_start %x\n", sBlk->uid_start);
++
++	s->s_flags |= MS_RDONLY;
++	s->s_op = &squashfs_ops;
++
++	/* Init inode_table block pointer array */
++	if(!(msBlk->block_cache = (squashfs_cache *) kmalloc(sizeof(squashfs_cache) * SQUASHFS_CACHED_BLKS, GFP_KERNEL))) {
++		ERROR("Failed to allocate block cache\n");
++		goto failed_mount;
++	}
++
++	for(i = 0; i < SQUASHFS_CACHED_BLKS; i++)
++		msBlk->block_cache[i].block = SQUASHFS_INVALID_BLK;
++
++	msBlk->next_cache = 0;
++
++	/* Allocate read_data block */
++	msBlk->read_size = (sBlk->block_size < SQUASHFS_METADATA_SIZE) ? SQUASHFS_METADATA_SIZE : sBlk->block_size;
++	if(!(msBlk->read_data = (char *) kmalloc(msBlk->read_size, GFP_KERNEL))) {
++		ERROR("Failed to allocate read_data block\n");
++		goto failed_mount1;
++	}
++
++	/* Allocate read_page block */
++	if(sBlk->block_size > PAGE_CACHE_SIZE && 
++	   !(msBlk->read_page = (char *) kmalloc(sBlk->block_size, GFP_KERNEL))) {
++		ERROR("Failed to allocate read_page block\n");
++		goto failed_mount2;
++	}
++
++	/* Allocate uid and gid tables */
++	if(!(msBlk->uid = (squashfs_uid *) kmalloc((sBlk->no_uids +
++		sBlk->no_guids) * sizeof(squashfs_uid), GFP_KERNEL))) {
++		ERROR("Failed to allocate uid/gid table\n");
++		goto failed_mount3;
++	}
++	msBlk->guid = msBlk->uid + sBlk->no_uids;
++   
++	if(msBlk->swap) {
++		squashfs_uid suid[sBlk->no_uids + sBlk->no_guids];
++
++		if(!read_data(s, (char *) &suid, sBlk->uid_start, ((sBlk->no_uids + sBlk->no_guids) *
++				sizeof(squashfs_uid)) | SQUASHFS_COMPRESSED_BIT, NULL)) {
++			SERROR("unable to read uid/gid table\n");
++			goto failed_mount4;
++		}
++		SQUASHFS_SWAP_DATA(msBlk->uid, suid, (sBlk->no_uids + sBlk->no_guids), (sizeof(squashfs_uid) * 8));
++	} else
++		if(!read_data(s, (char *) msBlk->uid, sBlk->uid_start, ((sBlk->no_uids + sBlk->no_guids) *
++				sizeof(squashfs_uid)) | SQUASHFS_COMPRESSED_BIT, NULL)) {
++			SERROR("unable to read uid/gid table\n");
++			goto failed_mount4;
++		}
++
++	if(!(s->s_root = d_alloc_root(squashfs_iget(s, sBlk->root_inode)))) {
++		ERROR("Root inode create failed\n");
++		goto failed_mount4;
++	}
++
++	TRACE("Leaving squashfs_read_super\n");
++	return s;
++
++failed_mount4:
++	kfree(msBlk->uid);
++failed_mount3:
++	kfree(msBlk->read_page);
++failed_mount2:
++	kfree(msBlk->read_data);
++failed_mount1:
++	kfree(msBlk->block_cache);
++failed_mount:
++	return NULL;
++}
++
++
++static int squashfs_statfs(struct super_block *s, struct statfs *buf)
++{
++	squashfs_super_block *sBlk = &s->u.squashfs_sb.sBlk;
++
++	TRACE("Entered squashfs_statfs\n");
++	buf->f_type = SQUASHFS_MAGIC;
++	buf->f_bsize = sBlk->block_size;
++	buf->f_blocks = ((sBlk->bytes_used - 1) >> sBlk->block_log) + 1;
++	buf->f_bfree = buf->f_bavail = 0;
++	buf->f_files = sBlk->inodes;
++	buf->f_ffree = 0;
++	buf->f_namelen = SQUASHFS_NAME_LEN;
++	return 0;
++}
++
++
++static int squashfs_symlink_readpage(struct file *file, struct page *page)
++{
++	struct inode *inode = page->mapping->host;
++	int index = page->index << PAGE_CACHE_SHIFT, length, bytes;
++	int block = inode->u.squashfs_i.start_block;
++	int offset = inode->u.squashfs_i.offset;
++
++	TRACE("Entered squashfs_symlink_readpage, page index %d, start block %x, offset %x\n",
++		page->index, inode->u.squashfs_i.start_block, inode->u.squashfs_i.offset);
++
++	for(length = 0; length < index; length += bytes) {
++		if(!(bytes = squashfs_get_cached_block(inode->i_sb, NULL, block, offset,
++					PAGE_CACHE_SIZE, &block, &offset))) {
++			ERROR("Unable to read symbolic link [%x:%x]\n", block, offset);
++			goto skip_read;
++		}
++	}
++
++	if(length != index) {
++		ERROR("(squashfs_symlink_readpage) length != index\n");
++		return 0;
++	}
++
++	bytes = (inode->i_size - length) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE : inode->i_size - length;
++	if(!(bytes = squashfs_get_cached_block(inode->i_sb, page_address(page), block, offset, bytes, &block, &offset)))
++		ERROR("Unable to read symbolic link [%x:%x]\n", block, offset);
++
++skip_read:
++	memset(page_address(page) + bytes, 0, PAGE_CACHE_SIZE - bytes);
++	flush_dcache_page(page);
++	SetPageUptodate(page);
++	UnlockPage(page);
++
++	return 0;
++}
++
++
++#define SIZE 256
++static int squashfs_readpage(struct file *file, struct page *page)
++{
++	struct inode *inode = page->mapping->host;
++	squashfs_sb_info *msBlk = &inode->i_sb->u.squashfs_sb;
++	squashfs_super_block *sBlk = &msBlk->sBlk;
++	unsigned char block_list[SIZE];
++	unsigned short *block_listp;
++	int index = sBlk->block_log > PAGE_CACHE_SHIFT ?
++		page->index >> (sBlk->block_log - PAGE_CACHE_SHIFT) :
++		page->index << (PAGE_CACHE_SHIFT - sBlk->block_log);
++	int block = inode->u.squashfs_i.start_block, i = 0;
++	int bytes = 0, block_ptr = inode->u.squashfs_i.block_list_start;
++	int offset = inode->u.squashfs_i.offset;
++	int file_blocks = ((inode->i_size - 1) >> sBlk->block_log) + 1;
++	int readahead_blks = sBlk->block_log >= PAGE_CACHE_SHIFT ? 1 : 1 << (PAGE_CACHE_SHIFT - sBlk->block_log);
++	
++	TRACE("Entered squashfs_readpage, page index %d, start block %x\n", page->index,
++		inode->u.squashfs_i.start_block);
++
++	if(index > file_blocks)
++		goto skip_read;
++
++	for(;;) {
++		int blocks = (index + readahead_blks - i);
++		if(blocks > (SIZE >> 1)) {
++			if((index - i) <= (SIZE >> 1))
++				blocks = index - i;
++			else
++				blocks = SIZE >> 1;
++		}
++
++		if(msBlk->swap) {
++			unsigned char sblock_list[SIZE];
++			if(!squashfs_get_cached_block(inode->i_sb, (char *) sblock_list, block_ptr, offset, blocks << 1, &block_ptr, &offset)) {
++				ERROR("Unable to read block list [%d:%x]\n", block_ptr, offset);
++				goto skip_read;
++			}
++			SQUASHFS_SWAP_SHORTS(((unsigned short *)block_list), ((unsigned short *)sblock_list), blocks);
++		} else
++			if(!squashfs_get_cached_block(inode->i_sb, (char *) block_list, block_ptr, offset, blocks << 1, &block_ptr, &offset)) {
++				ERROR("Unable to read block list [%d:%x]\n", block_ptr, offset);
++				goto skip_read;
++			}
++		for(block_listp = (unsigned short *) block_list; i < index && blocks; i ++, block_listp ++, blocks --)
++			block += SQUASHFS_COMPRESSED_SIZE(*block_listp);
++		if(blocks >= readahead_blks)
++			break;
++	}
++
++	if(sBlk->block_log > PAGE_CACHE_SHIFT) {
++		int mask = (1 << (sBlk->block_log - PAGE_CACHE_SHIFT)) - 1;
++		int start_index = page->index & ~mask;
++		int end_index = start_index | mask;
++		int byte_offset = 0;
++
++		down(&msBlk->read_page_mutex);
++		if(!(bytes = read_data(inode->i_sb, msBlk->read_page, block, *block_listp, NULL))) {
++			ERROR("Unable to read page, block %x, size %x\n", block, (int) *block_listp);
++			goto skip_read;
++		}
++
++		for(i = start_index; i <= end_index && byte_offset < bytes; i++, byte_offset += PAGE_CACHE_SIZE) {
++			int available_bytes = (bytes - byte_offset) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE : bytes - byte_offset;
++
++			TRACE("bytes %d, i %d, byte_offset %d, available_bytes %d\n", bytes, i, byte_offset, available_bytes);
++
++			if(i == page->index)  {
++				memcpy(page_address(page), msBlk->read_page + byte_offset, available_bytes);
++				memset(page_address(page) + available_bytes, 0, PAGE_CACHE_SIZE - available_bytes);
++				flush_dcache_page(page);
++				SetPageUptodate(page);
++				UnlockPage(page);
++			}  else {
++				struct page *push_page;
++
++				if((push_page = grab_cache_page_nowait(page->mapping, i))) {
++					memcpy(page_address(push_page), msBlk->read_page + byte_offset, available_bytes);
++					memset(page_address(push_page) + available_bytes, 0, PAGE_CACHE_SIZE - available_bytes);
++					flush_dcache_page(push_page);
++					SetPageUptodate(push_page);
++					UnlockPage(push_page);
++					page_cache_release(push_page);
++				}
++			}
++		}
++		up( &msBlk->read_page_mutex);
++
++		return 0;
++
++	} else if(sBlk->block_log == PAGE_CACHE_SHIFT) {
++		if(!(bytes = read_data(inode->i_sb, page_address(page), block, *block_listp, NULL)))
++			ERROR("Unable to read page, block %x, size %x\n", block, (int) *block_listp);
++
++	} else {
++		int i_end = index + (1 << (PAGE_CACHE_SHIFT - sBlk->block_log));
++		char *p = (char *) page_address(page);
++		int byte;
++
++		if(i_end > file_blocks)
++			i_end = file_blocks;
++
++		while(index < i_end) {
++			if(!(byte = read_data(inode->i_sb, p, block, *block_listp, NULL))) {
++				ERROR("Unable to read page, block %x, size %x\n", block, (int) *block_listp);
++				goto skip_read;
++			}
++			block += SQUASHFS_COMPRESSED_SIZE(*block_listp);
++			p += byte;
++			bytes += byte;
++			index ++;
++			block_listp ++;
++		}
++	}
++
++skip_read:
++	memset(page_address(page) + bytes, 0, PAGE_CACHE_SIZE - bytes);
++	flush_dcache_page(page);
++	SetPageUptodate(page);
++	UnlockPage(page);
++
++	return 0;
++}
++
++
++static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
++{
++	struct inode *i = file->f_dentry->d_inode;
++	squashfs_sb_info *msBlk = &i->i_sb->u.squashfs_sb;
++	squashfs_super_block *sBlk = &msBlk->sBlk;
++	int next_block = i->u.squashfs_i.start_block + sBlk->directory_table_start, next_offset =
++		i->u.squashfs_i.offset, length = 0, dirs_read = 0, dir_count;
++	squashfs_dir_header dirh;
++	char buffer[sizeof(squashfs_dir_entry) + SQUASHFS_NAME_LEN + 1];
++	squashfs_dir_entry *dire = (squashfs_dir_entry *) buffer;
++
++	TRACE("Entered squashfs_readdir [%x:%x]\n", next_block, next_offset);
++
++	while(length < i->i_size) {
++		/* read directory header */
++		if(msBlk->swap) {
++			squashfs_dir_header sdirh;
++			if(!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, next_block,
++						next_offset, sizeof(sdirh), &next_block, &next_offset))
++				goto failed_read;
++			length += sizeof(sdirh);
++			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
++		} else {
++			if(!squashfs_get_cached_block(i->i_sb, (char *) &dirh, next_block,
++						next_offset, sizeof(dirh), &next_block, &next_offset))
++				goto failed_read;
++			length += sizeof(dirh);
++		}
++
++		dir_count = dirh.count + 1;
++		while(dir_count--) {
++			if(msBlk->swap) {
++				squashfs_dir_entry sdire;
++				if(!squashfs_get_cached_block(i->i_sb, (char *) &sdire, next_block,
++							next_offset, sizeof(sdire), &next_block, &next_offset))
++					goto failed_read;
++				length += sizeof(sdire);
++				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
++			} else {
++				if(!squashfs_get_cached_block(i->i_sb, (char *) dire, next_block,
++							next_offset, sizeof(*dire), &next_block, &next_offset))
++					goto failed_read;
++				length += sizeof(*dire);
++			}
++
++			if(!squashfs_get_cached_block(i->i_sb, dire->name, next_block,
++						next_offset, dire->size + 1, &next_block, &next_offset))
++				goto failed_read;
++			length += dire->size + 1;
++
++			if(file->f_pos >= length)
++				continue;
++
++			dire->name[dire->size + 1] = '\0';
++
++			TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d)\n", dirent,
++			dire->name, dire->size + 1, (int) file->f_pos,
++			dirh.start_block, dire->offset, squashfs_filetype_table[dire->type]);
++
++			if(filldir(dirent, dire->name, dire->size + 1, file->f_pos, SQUASHFS_MK_VFS_INODE(dirh.start_block,
++							dire->offset), squashfs_filetype_table[dire->type]) < 0) {
++				TRACE("Filldir returned less than 0\n");
++				return dirs_read;
++			}
++
++			file->f_pos = length;
++			dirs_read ++;
++		}
++	}
++
++	return dirs_read;
++
++failed_read:
++	ERROR("Unable to read directory block [%x:%x]\n", next_block, next_offset);
++	return 0;
++}
++
++
++static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry)
++{
++	const char *name =dentry->d_name.name;
++	int len = dentry->d_name.len;
++	struct inode *inode = NULL;
++	squashfs_sb_info *msBlk = &i->i_sb->u.squashfs_sb;
++	squashfs_super_block *sBlk = &msBlk->sBlk;
++	int next_block = i->u.squashfs_i.start_block + sBlk->directory_table_start, next_offset =
++		i->u.squashfs_i.offset, length = 0, dir_count;
++	squashfs_dir_header dirh;
++	char buffer[sizeof(squashfs_dir_entry) + SQUASHFS_NAME_LEN];
++	squashfs_dir_entry *dire = (squashfs_dir_entry *) buffer;
++
++	TRACE("Entered squashfs_lookup [%x:%x]\n", next_block, next_offset);
++
++	while(length < i->i_size) {
++		/* read directory header */
++		if(msBlk->swap) {
++			squashfs_dir_header sdirh;
++			if(!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, next_block, next_offset,
++						sizeof(sdirh), &next_block, &next_offset))
++				goto failed_read;
++			length += sizeof(sdirh);
++			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
++		} else {
++			if(!squashfs_get_cached_block(i->i_sb, (char *) &dirh, next_block, next_offset,
++						sizeof(dirh), &next_block, &next_offset))
++				goto failed_read;
++			length += sizeof(dirh);
++		}
++
++		dir_count = dirh.count + 1;
++		while(dir_count--) {
++			if(msBlk->swap) {
++				squashfs_dir_entry sdire;
++				if(!squashfs_get_cached_block(i->i_sb, (char *) &sdire,
++							next_block,next_offset, sizeof(sdire), &next_block, &next_offset))
++					goto failed_read;
++				length += sizeof(*dire);
++				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
++			} else {
++				if(!squashfs_get_cached_block(i->i_sb, (char *) dire,
++							next_block,next_offset, sizeof(*dire), &next_block, &next_offset))
++					goto failed_read;
++				length += sizeof(*dire);
++			}
++
++			if(!squashfs_get_cached_block(i->i_sb, dire->name,
++						next_block, next_offset, dire->size + 1, &next_block, &next_offset))
++				goto failed_read;
++			length += dire->size + 1;
++
++			if((len == dire->size + 1) && !strncmp(name, dire->name, len)) {
++				squashfs_inode ino = SQUASHFS_MKINODE(dirh.start_block, dire->offset);
++
++				TRACE("calling squashfs_iget for directory entry %s, inode %x:%x\n",
++						name, dirh.start_block, dire->offset);
++
++				inode = squashfs_iget(i->i_sb, ino);
++
++				goto exit_loop;
++			}
++		}
++	}
++
++exit_loop:
++	d_add(dentry, inode);
++	return ERR_PTR(0);
++
++failed_read:
++	ERROR("Unable to read directory block [%x:%x]\n", next_block, next_offset);
++	goto exit_loop;
++}
++
++
++static void squashfs_put_super(struct super_block *s)
++{
++	if(s->u.squashfs_sb.block_cache) kfree(s->u.squashfs_sb.block_cache);
++	if(s->u.squashfs_sb.read_data) kfree(s->u.squashfs_sb.read_data);
++	if(s->u.squashfs_sb.read_page) kfree(s->u.squashfs_sb.read_page);
++	if(s->u.squashfs_sb.uid) kfree(s->u.squashfs_sb.uid);
++	s->u.squashfs_sb.block_cache = (void *) s->u.squashfs_sb.uid =
++		s->u.squashfs_sb.read_data = s->u.squashfs_sb.read_page = NULL;
++}
++
++
++static int __init init_squashfs_fs(void)
++{
++
++	if(!(stream.workspace = (char *) vmalloc(zlib_inflate_workspacesize()))) {
++		ERROR("Failed to allocate zlib workspace\n");
++		return -ENOMEM;
++	}
++	return register_filesystem(&squashfs_fs_type);
++}
++
++
++static void __exit exit_squashfs_fs(void)
++{
++	vfree(stream.workspace);
++	unregister_filesystem(&squashfs_fs_type);
++}
++
++
++EXPORT_NO_SYMBOLS;
++
++module_init(init_squashfs_fs);
++module_exit(exit_squashfs_fs);
++MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
++MODULE_AUTHOR("Phillip Lougher <phillip@lougher.demon.co.uk>");
++MODULE_LICENSE("GPL");
+diff -urN src/linux-dist/linux/include/linux/fs.h src/linux/linux/include/linux/fs.h
+--- src/linux-dist/linux/include/linux/fs.h	2003-07-04 03:12:25.000000000 -0500
++++ src/linux/linux/include/linux/fs.h	2004-03-29 17:00:53.000000000 -0600
+@@ -313,6 +313,7 @@
+ #include <linux/usbdev_fs_i.h>
+ #include <linux/jffs2_fs_i.h>
+ #include <linux/cramfs_fs_sb.h>
++#include <linux/squashfs_fs_i.h>
+ 
+ /*
+  * Attribute flags.  These should be or-ed together to figure out what
+@@ -503,6 +504,7 @@
+ 		struct socket			socket_i;
+ 		struct usbdev_inode_info        usbdev_i;
+ 		struct jffs2_inode_info		jffs2_i;
++		struct squashfs_inode_info	squashfs_i;
+ 		void				*generic_ip;
+ 	} u;
+ };
+@@ -697,6 +699,7 @@
+ #include <linux/usbdev_fs_sb.h>
+ #include <linux/cramfs_fs_sb.h>
+ #include <linux/jffs2_fs_sb.h>
++#include <linux/squashfs_fs_sb.h>
+ 
+ extern struct list_head super_blocks;
+ extern spinlock_t sb_lock;
+@@ -755,6 +758,7 @@
+ 		struct usbdev_sb_info   usbdevfs_sb;
+ 		struct jffs2_sb_info	jffs2_sb;
+ 		struct cramfs_sb_info	cramfs_sb;
++		struct squashfs_sb_info	squashfs_sb;
+ 		void			*generic_sbp;
+ 	} u;
+ 	/*
+diff -urN src/linux-dist/linux/include/linux/squashfs_fs.h src/linux/linux/include/linux/squashfs_fs.h
+--- src/linux-dist/linux/include/linux/squashfs_fs.h	1969-12-31 18:00:00.000000000 -0600
++++ src/linux/linux/include/linux/squashfs_fs.h	2004-03-29 17:00:53.000000000 -0600
+@@ -0,0 +1,323 @@
++#ifndef SQUASHFS_FS
++#define SQUASHFS_FS
++/*
++ * Squashfs
++ *
++ * Copyright (c) 2002 Phillip Lougher <phillip@lougher.demon.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ * squashfs_fs.h
++ */
++
++#define SQUASHFS_MAJOR			1
++#define SQUASHFS_MINOR			0
++#define SQUASHFS_MAGIC			0x73717368
++#define SQUASHFS_MAGIC_SWAP		0x68737173
++#define SQUASHFS_START			0
++
++/* size of metadata (inode and directory) blocks */
++#define SQUASHFS_METADATA_SIZE		8192
++#define SQUASHFS_METADATA_LOG		13
++
++/* default size of data blocks */
++#define SQUASHFS_FILE_SIZE		32768
++#define SQUASHFS_FILE_LOG		15
++
++#define SQUASHFS_FILE_MAX_SIZE		32768
++
++/* Max number of uids and gids */
++#define SQUASHFS_UIDS			48
++#define SQUASHFS_GUIDS			15
++
++/* Max length of filename (not 255) */
++#define SQUASHFS_NAME_LEN		256
++
++#define SQUASHFS_INVALID		((long long) 0xffffffffffff)
++#define SQUASHFS_INVALID_BLK		((long long) 0xffffffff)
++#define SQUASHFS_USED_BLK		((long long) 0xfffffffe)
++
++/* Filesystem flags */
++#define SQUASHFS_NOI			1
++#define SQUASHFS_NOD			2
++#define SQUASHFS_CHECK			4
++#define SQUASHFS_UNCOMPRESSED_INODES(flags)	(flags & SQUASHFS_NOI)
++#define SQUASHFS_UNCOMPRESSED_DATA(flags)	(flags & SQUASHFS_NOD)
++#define SQUASHFS_CHECK_DATA(flags)		(flags & SQUASHFS_CHECK)
++#define SQUASHFS_MKFLAGS(noi, nod, check_data)	(noi | (nod << 1) | (check_data << 2))
++
++/* Max number of types and file types */
++#define SQUASHFS_TYPES			5
++#define SQUASHFS_DIR_TYPE		1
++#define SQUASHFS_FILE_TYPE		2
++#define SQUASHFS_SYMLINK_TYPE		3
++#define SQUASHFS_BLKDEV_TYPE		4
++#define SQUASHFS_CHRDEV_TYPE		5
++
++#define SQUASHFS_IPC_TYPE		0
++#define SQUASHFS_FIFO_TYPE		6
++#define SQUASHFS_SOCKET_TYPE		7
++
++/* Flag whether block is compressed or uncompressed, bit is set if block is uncompressed */
++#define SQUASHFS_COMPRESSED_BIT		(1 << 15)
++#define SQUASHFS_COMPRESSED_SIZE(B)	(((B) & ~SQUASHFS_COMPRESSED_BIT) ? \
++					(B) & ~SQUASHFS_COMPRESSED_BIT : SQUASHFS_COMPRESSED_BIT)
++
++#define SQUASHFS_COMPRESSED(B)		(!((B) & SQUASHFS_COMPRESSED_BIT))
++
++/*
++ * Inode number ops.  Inodes consist of a compressed block number, and an uncompressed
++ * offset within that block
++ */
++#define SQUASHFS_INODE_BLK(a)		((unsigned int) ((a) >> 16))
++#define SQUASHFS_INODE_OFFSET(a)	((unsigned int) ((a) & 0xffff))
++#define SQUASHFS_MKINODE(A, B)		((squashfs_inode)(((squashfs_inode) (A) << 16)\
++					+ (B)))
++
++/* Compute 32 bit VFS inode number from squashfs inode number */
++#define SQUASHFS_MK_VFS_INODE(a, b)	((unsigned int) (((a) << 8) + ((b) >> 2) + 1))
++
++/* Translate between VFS mode and squashfs mode */
++#define SQUASHFS_MODE(a)		((a) & 0xfff)
++
++/* cached data constants for filesystem */
++#define SQUASHFS_CACHED_BLKS		8
++
++#define SQUASHFS_MAX_FILE_SIZE_LOG	32
++#define SQUASHFS_MAX_FILE_SIZE		((long long) 1 << (SQUASHFS_MAX_FILE_SIZE_LOG - 1))
++
++#define SQUASHFS_MARKER_BYTE		0xff
++
++/*
++ * definitions for structures on disk
++ */
++
++typedef unsigned int		squashfs_block;
++typedef long long		squashfs_inode;
++
++typedef unsigned int		squashfs_uid;
++
++typedef struct squashfs_super_block {
++	unsigned int		s_magic;
++	unsigned int		inodes;
++	unsigned int		bytes_used;
++	unsigned int		uid_start;
++	unsigned int		guid_start;
++	unsigned int		inode_table_start;
++	unsigned int		directory_table_start;
++	unsigned int		s_major:16;
++	unsigned int		s_minor:16;
++	unsigned int		block_size:16;
++	unsigned int		block_log:16;
++	unsigned int		flags:8;
++	unsigned int		no_uids:8;
++	unsigned int		no_guids:8;
++	time_t			mkfs_time /* time of filesystem creation */;
++	squashfs_inode		root_inode;
++} __attribute__ ((packed)) squashfs_super_block;
++
++typedef struct {
++	unsigned int		inode_type:4;
++	unsigned int		mode:12; /* protection */
++	unsigned int		uid:4; /* index into uid table */
++	unsigned int		guid:4; /* index into guid table */
++} __attribute__ ((packed)) squashfs_base_inode_header;
++
++typedef struct {
++	unsigned int		inode_type:4;
++	unsigned int		mode:12; /* protection */
++	unsigned int		uid:4; /* index into uid table */
++	unsigned int		guid:4; /* index into guid table */
++	unsigned int		type:4;
++	unsigned int		offset:4;
++} __attribute__ ((packed)) squashfs_ipc_inode_header;
++
++typedef struct {
++	unsigned int		inode_type:4;
++	unsigned int		mode:12; /* protection */
++	unsigned int		uid:4; /* index into uid table */
++	unsigned int		guid:4; /* index into guid table */
++	unsigned short		rdev;
++} __attribute__ ((packed)) squashfs_dev_inode_header;
++	
++typedef struct {
++	unsigned int		inode_type:4;
++	unsigned int		mode:12; /* protection */
++	unsigned int		uid:4; /* index into uid table */
++	unsigned int		guid:4; /* index into guid table */
++	unsigned short		symlink_size;
++	char			symlink[0];
++} __attribute__ ((packed)) squashfs_symlink_inode_header;
++
++typedef struct {
++	unsigned int		inode_type:4;
++	unsigned int		mode:12; /* protection */
++	unsigned int		uid:4; /* index into uid table */
++	unsigned int		guid:4; /* index into guid table */
++	time_t			mtime;
++	squashfs_block		start_block;
++	unsigned int		file_size:SQUASHFS_MAX_FILE_SIZE_LOG;
++	unsigned short		block_list[0];
++} __attribute__ ((packed)) squashfs_reg_inode_header;
++
++typedef struct {
++	unsigned int		inode_type:4;
++	unsigned int		mode:12; /* protection */
++	unsigned int		uid:4; /* index into uid table */
++	unsigned int		guid:4; /* index into guid table */
++	unsigned int		file_size:19;
++	unsigned int		offset:13;
++	time_t			mtime;
++	unsigned int		start_block:24;
++} __attribute__  ((packed)) squashfs_dir_inode_header;
++
++typedef union {
++	squashfs_base_inode_header	base;
++	squashfs_dev_inode_header	dev;
++	squashfs_symlink_inode_header	symlink;
++	squashfs_reg_inode_header	reg;
++	squashfs_dir_inode_header	dir;
++	squashfs_ipc_inode_header	ipc;
++} squashfs_inode_header;
++	
++typedef struct {
++	unsigned int		offset:13;
++	unsigned int		type:3;
++	unsigned int		size:8;
++	char			name[0];
++} __attribute__ ((packed)) squashfs_dir_entry;
++
++typedef struct {
++	unsigned int		count:8;
++	unsigned int		start_block:24;
++} __attribute__ ((packed)) squashfs_dir_header;
++
++
++extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen);
++extern int squashfs_uncompress_init(void);
++extern int squashfs_uncompress_exit(void);
++
++/*
++ * macros to convert each packed bitfield structure from little endian to big
++ * endian and vice versa.  These are needed when creating or using a filesystem on a
++ * machine with different byte ordering to the target architecture.
++ *
++ */
++
++#define SQUASHFS_SWAP_SUPER_BLOCK(s, d) {\
++	SQUASHFS_MEMSET(s, d, sizeof(squashfs_super_block));\
++	SQUASHFS_SWAP((s)->s_magic, d, 0, 32);\
++	SQUASHFS_SWAP((s)->inodes, d, 32, 32);\
++	SQUASHFS_SWAP((s)->bytes_used, d, 64, 32);\
++	SQUASHFS_SWAP((s)->uid_start, d, 96, 32);\
++	SQUASHFS_SWAP((s)->guid_start, d, 128, 32);\
++	SQUASHFS_SWAP((s)->inode_table_start, d, 160, 32);\
++	SQUASHFS_SWAP((s)->directory_table_start, d, 192, 32);\
++	SQUASHFS_SWAP((s)->s_major, d, 224, 16);\
++	SQUASHFS_SWAP((s)->s_minor, d, 240, 16);\
++	SQUASHFS_SWAP((s)->block_size, d, 256, 16);\
++	SQUASHFS_SWAP((s)->block_log, d, 272, 16);\
++	SQUASHFS_SWAP((s)->flags, d, 288, 8);\
++	SQUASHFS_SWAP((s)->no_uids, d, 296, 8);\
++	SQUASHFS_SWAP((s)->no_guids, d, 304, 8);\
++	SQUASHFS_SWAP((s)->mkfs_time, d, 312, 32);\
++	SQUASHFS_SWAP((s)->root_inode, d, 344, 64);\
++}
++
++#define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, n) {\
++	SQUASHFS_MEMSET(s, d, n);\
++	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
++	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
++	SQUASHFS_SWAP((s)->uid, d, 16, 4);\
++	SQUASHFS_SWAP((s)->guid, d, 20, 4);\
++}
++
++#define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) {\
++	SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dev_inode_header));\
++	SQUASHFS_SWAP((s)->type, d, 24, 4);\
++	SQUASHFS_SWAP((s)->offset, d, 28, 4);\
++}
++#define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) {\
++	SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dev_inode_header));\
++	SQUASHFS_SWAP((s)->rdev, d, 24, 16);\
++}
++
++#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) {\
++	SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_symlink_inode_header));\
++	SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\
++}
++
++#define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) {\
++	SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_reg_inode_header));\
++	SQUASHFS_SWAP((s)->mtime, d, 24, 32);\
++	SQUASHFS_SWAP((s)->start_block, d, 56, 32);\
++	SQUASHFS_SWAP((s)->file_size, d, 88, SQUASHFS_MAX_FILE_SIZE_LOG);\
++}
++
++#define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) {\
++	SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dir_inode_header));\
++	SQUASHFS_SWAP((s)->file_size, d, 24, 19);\
++	SQUASHFS_SWAP((s)->offset, d, 43, 13);\
++	SQUASHFS_SWAP((s)->mtime, d, 56, 32);\
++	SQUASHFS_SWAP((s)->start_block, d, 88, 24);\
++}
++
++#define SQUASHFS_SWAP_DIR_HEADER(s, d) {\
++	SQUASHFS_MEMSET(s, d, sizeof(squashfs_dir_header));\
++	SQUASHFS_SWAP((s)->count, d, 0, 8);\
++	SQUASHFS_SWAP((s)->start_block, d, 8, 24);\
++}
++
++#define SQUASHFS_SWAP_DIR_ENTRY(s, d) {\
++	SQUASHFS_MEMSET(s, d, sizeof(squashfs_dir_entry));\
++	SQUASHFS_SWAP((s)->offset, d, 0, 13);\
++	SQUASHFS_SWAP((s)->type, d, 13, 3);\
++	SQUASHFS_SWAP((s)->size, d, 16, 8);\
++}
++
++#define SQUASHFS_SWAP_SHORTS(s, d, n) {\
++	int entry;\
++	int bit_position;\
++	SQUASHFS_MEMSET(s, d, n * 2);\
++	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += 16)\
++		SQUASHFS_SWAP(s[entry], d, bit_position, 16);\
++}
++
++#define SQUASHFS_SWAP_DATA(s, d, n, bits) {\
++	int entry;\
++	int bit_position;\
++	SQUASHFS_MEMSET(s, d, n * bits / 8);\
++	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += bits)\
++		SQUASHFS_SWAP(s[entry], d, bit_position, bits);\
++}
++
++#ifdef __KERNEL__
++/*
++ * macros used to swap each structure entry, taking into account
++ * bitfields and different bitfield placing conventions on differing architectures
++ */
++#include <asm/byteorder.h>
++#ifdef __BIG_ENDIAN
++	/* convert from little endian to big endian */
++#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, tbits, b_pos)
++#else
++	/* convert from big endian to little endian */ 
++#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, tbits, 64 - tbits - b_pos)
++#endif
++
++#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\
++	int bits;\
++	int b_pos = pos % 8;\
++	unsigned long long val = 0;\
++	unsigned char *s = (unsigned char *)p + (pos / 8);\
++	unsigned char *d = ((unsigned char *) &val) + 7;\
++	for(bits = 0; bits < (tbits + b_pos); bits += 8) \
++		*d-- = *s++;\
++	value = (val >> (SHIFT));\
++}
++#define SQUASHFS_MEMSET(s, d, n)	memset(s, 0, n);
++#endif
++#endif
+diff -urN src/linux-dist/linux/include/linux/squashfs_fs_i.h src/linux/linux/include/linux/squashfs_fs_i.h
+--- src/linux-dist/linux/include/linux/squashfs_fs_i.h	1969-12-31 18:00:00.000000000 -0600
++++ src/linux/linux/include/linux/squashfs_fs_i.h	2004-03-29 17:00:53.000000000 -0600
+@@ -0,0 +1,21 @@
++#ifndef SQUASHFS_FS_I
++#define SQUASHFS_FS_I
++/*
++ * Squashfs
++ *
++ * Copyright (c) 2002 Phillip Lougher <phillip@lougher.demon.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ * squashfs_fs_i.h
++ */
++
++typedef struct squashfs_inode_info {
++	unsigned int	start_block;
++	unsigned int	block_list_start;
++	unsigned int	offset;
++	} squashfs_inode_info;
++#endif
+diff -urN src/linux-dist/linux/include/linux/squashfs_fs_sb.h src/linux/linux/include/linux/squashfs_fs_sb.h
+--- src/linux-dist/linux/include/linux/squashfs_fs_sb.h	1969-12-31 18:00:00.000000000 -0600
++++ src/linux/linux/include/linux/squashfs_fs_sb.h	2004-03-29 17:00:53.000000000 -0600
+@@ -0,0 +1,41 @@
++#ifndef SQUASHFS_FS_SB
++#define SQUASHFS_FS_SB
++/*
++ * Squashfs
++ *
++ * Copyright (c) 2002 Phillip Lougher <phillip@lougher.demon.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ * squashfs_fs_sb.h
++ */
++
++#include <linux/squashfs_fs.h>
++
++typedef struct {
++	unsigned int	block;
++	int		length;
++	unsigned int	next_index;
++	char		*data;
++	} squashfs_cache;
++
++typedef struct squashfs_sb_info {
++	squashfs_super_block	sBlk;
++	int			devblksize;
++	int			devblksize_log2;
++	int			swap;
++	squashfs_cache		*block_cache;
++	int			next_cache;
++	squashfs_uid		*uid;
++	squashfs_uid		*guid;
++	unsigned int		read_size;
++	char			*read_data;
++	char			*read_page;
++	struct semaphore	read_page_mutex;
++	struct semaphore	block_cache_mutex;
++	wait_queue_head_t	waitq;
++	} squashfs_sb_info;
++#endif
+diff -urN src/linux-dist/linux/init/do_mounts.c src/linux/linux/init/do_mounts.c
+--- src/linux-dist/linux/init/do_mounts.c	2003-11-08 02:13:20.000000000 -0600
++++ src/linux/linux/init/do_mounts.c	2004-03-29 17:00:53.000000000 -0600
+@@ -16,6 +16,7 @@
+ #include <linux/ext2_fs.h>
+ #include <linux/romfs_fs.h>
+ #include <linux/cramfs_fs.h>
++#include <linux/squashfs_fs.h>
+ 
+ #undef BUILD_CRAMDISK
+ 
+@@ -470,6 +471,7 @@
+  * 	ext2
+  *	romfs
+  * 	gzip
++ * 	squashfs
+  */
+ static int __init 
+ identify_ramdisk_image(int fd, int start_block)
+@@ -479,6 +481,7 @@
+ 	struct ext2_super_block *ext2sb;
+ 	struct romfs_super_block *romfsb;
+ 	struct cramfs_super *cramfsb;
++	struct squashfs_super_block *squashfsb;
+ 	int nblocks = -1;
+ 	unsigned char *buf;
+ 
+@@ -490,6 +493,7 @@
+ 	ext2sb = (struct ext2_super_block *) buf;
+ 	romfsb = (struct romfs_super_block *) buf;
+ 	cramfsb = (struct cramfs_super *) buf;
++	squashfsb = (struct squashfs_super_block *) buf;
+ 	memset(buf, 0xe5, size);
+ 
+ 	/*
+@@ -536,6 +540,15 @@
+ 		goto done;
+ 	}
+ 
++	/* squashfs is at block zero too */
++	if (squashfsb->s_magic == SQUASHFS_MAGIC) {
++		printk(KERN_NOTICE
++		       "RAMDISK: squashfs filesystem found at block %d\n",
++		       start_block);
++		nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
++		goto done;
++	}
++
+ 	/*
+ 	 * Read block 1 to test for minix and ext2 superblock
+ 	 */
+diff -urN src/linux-dist/linux/kernel/ksyms.c src/linux/linux/kernel/ksyms.c
+--- src/linux-dist/linux/kernel/ksyms.c	2003-07-04 03:12:28.000000000 -0500
++++ src/linux/linux/kernel/ksyms.c	2004-03-29 17:00:53.000000000 -0600
+@@ -482,9 +483,9 @@
+ EXPORT_SYMBOL(simple_strtoull);
+ EXPORT_SYMBOL(system_utsname);	/* UTS data */
+ EXPORT_SYMBOL(uts_sem);		/* UTS semaphore */
+-#ifndef __mips__
++//#ifndef __mips__ //bite me. -mbm.
+ EXPORT_SYMBOL(sys_call_table);
+-#endif
++//#endif
+ EXPORT_SYMBOL(machine_restart);
+ EXPORT_SYMBOL(machine_halt);
+ EXPORT_SYMBOL(machine_power_off);
+diff -urN src/linux-dist/linux/lib/Config.in src/linux/linux/lib/Config.in
+--- src/linux-dist/linux/lib/Config.in	2003-07-04 03:12:29.000000000 -0500
++++ src/linux/linux/lib/Config.in	2004-03-29 17:00:53.000000000 -0600
+@@ -8,12 +8,14 @@
+ # Do we need the compression support?
+ #
+ if [ "$CONFIG_CRAMFS" = "y" -o \
++     "$CONFIG_SQUASHFS" = "y" -o \
+      "$CONFIG_PPP_DEFLATE" = "y" -o \
+      "$CONFIG_JFFS2_FS" = "y" -o \
+      "$CONFIG_ZISOFS_FS" = "y" ]; then
+    define_tristate CONFIG_ZLIB_INFLATE y
+ else
+   if [ "$CONFIG_CRAMFS" = "m" -o \
++       "$CONFIG_SQUASHFS" = "m" -o \
+        "$CONFIG_PPP_DEFLATE" = "m" -o \
+        "$CONFIG_JFFS2_FS" = "m" -o \
+        "$CONFIG_ZISOFS_FS" = "m" ]; then