[ifxmips] refresh kernel patches

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 003-squashfs_lzma.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
index 06aa001..5a42f25 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/fs/squashfs/inode.c
+Index: linux-2.6.25.4/fs/squashfs/inode.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/squashfs/inode.c  2007-09-21 16:23:55.000000000 +0800
-+++ linux-2.6.23-rc6/fs/squashfs/inode.c       2007-09-21 16:23:56.000000000 +0800
+--- linux-2.6.25.4.orig/fs/squashfs/inode.c
++++ linux-2.6.25.4/fs/squashfs/inode.c

 @@ -4,6 +4,9 @@
   * Copyright (c) 2002, 2003, 2004, 2005, 2006
   * Phillip Lougher <phillip@lougher.org.uk>
 @@ -4,6 +4,9 @@
   * Copyright (c) 2002, 2003, 2004, 2005, 2006
   * Phillip Lougher <phillip@lougher.org.uk>


@@ -40,7 +40,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
  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);
  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 *);
  
  
                        const char *, void *, struct vfsmount *);
  
  


@@ -52,7 +52,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
  
  static struct file_system_type squashfs_fs_type = {
        .owner = THIS_MODULE,
  
  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;
  
        if (compressed) {
                int zlib_err;
  


@@ -68,7 +68,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
                stream.next_in = c_buffer;
                stream.avail_in = c_byte;
                stream.next_out = buffer;
                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;
                        bytes = 0;
                } else
                        bytes = stream.total_out;


@@ -77,7 +77,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
                up(&msblk->read_data_mutex);
        }
  
                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");
  
        printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
                "Phillip Lougher\n");
  


@@ -97,7 +97,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
                destroy_inodecache();
        }
  
                destroy_inodecache();
        }
  

-@@ -2064,7 +2098,9 @@
+@@ -2064,7 +2098,9 @@ out:

  
  static void __exit exit_squashfs_fs(void)
  {
  
  static void __exit exit_squashfs_fs(void)
  {