diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:24:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:24:13 +0000 |
| commit | 7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe (patch) | |
| tree | 2c3e3d4268c3d9f5742e872e32686ebfebd970d4 /target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch | |
| parent | 6761ddd557729c97c12d19832c70e279839b4d5d (diff) | |
| download | upstream-7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe.tar.gz upstream-7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe.tar.bz2 upstream-7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe.zip | |
refresh generic 2.6.22 patches
SVN-Revision: 11186
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch index 1561461d9e..195cb6ea03 100644 --- a/target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch +++ b/target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/inode.c ---- linux-2.6.21.1.old/fs/squashfs/inode.c 2007-05-26 19:03:45.499713896 +0200 -+++ linux-2.6.21.1.dev/fs/squashfs/inode.c 2007-05-26 19:07:27.951896024 +0200 +Index: linux-2.6.22.19/fs/squashfs/inode.c +=================================================================== +--- linux-2.6.22.19.orig/fs/squashfs/inode.c ++++ linux-2.6.22.19/fs/squashfs/inode.c @@ -4,6 +4,9 @@ * Copyright (c) 2002, 2003, 2004, 2005, 2006 * Phillip Lougher <phillip@lougher.org.uk> @@ -39,7 +40,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ static void squashfs_put_super(struct super_block *); static int squashfs_statfs(struct dentry *, struct kstatfs *); static int squashfs_symlink_readpage(struct file *file, struct page *page); -@@ -64,7 +81,11 @@ +@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s const char *, void *, struct vfsmount *); @@ -51,7 +52,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ static struct file_system_type squashfs_fs_type = { .owner = THIS_MODULE, -@@ -249,6 +270,15 @@ +@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d if (compressed) { int zlib_err; @@ -67,7 +68,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ stream.next_in = c_buffer; stream.avail_in = c_byte; stream.next_out = buffer; -@@ -263,7 +293,7 @@ +@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d bytes = 0; } else bytes = stream.total_out; @@ -76,7 +77,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ up(&msblk->read_data_mutex); } -@@ -2045,15 +2075,19 @@ +@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void) printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) " "Phillip Lougher\n"); @@ -96,7 +97,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ destroy_inodecache(); } -@@ -2064,7 +2098,9 @@ +@@ -2064,7 +2098,9 @@ out: static void __exit exit_squashfs_fs(void) { |