SOURCES: kernel-desktop-squashfs.patch - fixed for 2.6.18.2

[sparky]

Author: sparky                       Date: Sun Nov 19 01:27:02 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed for 2.6.18.2

---- Files affected:
SOURCES:
   kernel-desktop-squashfs.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-squashfs.patch
diff -u SOURCES/kernel-desktop-squashfs.patch:1.2 SOURCES/kernel-desktop-squashfs.patch:1.3
--- SOURCES/kernel-desktop-squashfs.patch:1.2	Sun Nov 19 01:24:33 2006
+++ SOURCES/kernel-desktop-squashfs.patch	Sun Nov 19 02:26:57 2006
@@ -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,7 +150,7 @@
 +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,
++static int squashfs_get_sb(struct file_system_type *, int,
 +				const char *, void *);
 +
 +static struct file_system_type squashfs_fs_type = {
@@ -1240,9 +1240,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");
@@ -2158,10 +2158,10 @@
 +}
 +
 +
-+static struct super_block *squashfs_get_sb(struct file_system_type *fs_type,
-+				int flags, const char *dev_name, void *data)
++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);
++	return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, mnt);
 +}
 +
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-squashfs.patch?r1=1.2&r2=1.3&f=u