Update of /cvsroot/gc-linux/linux/fs/gcdvdfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/fs/gcdvdfs
Modified Files:
main.c
Log Message:
Merged 2.6.18.
Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/gcdvdfs/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c 6 Mar 2006 00:32:42 -0000 1.1
+++ main.c 17 Feb 2007 23:43:42 -0000 1.2
@@ -141,8 +141,9 @@
i_size_write(i,size);
}
-static int gc_dvdfs_statfs(struct super_block *sb,struct kstatfs *sfs)
+static int gc_dvdfs_statfs(struct dentry * dentry,struct kstatfs *sfs)
{
+ struct super_block *sb = dentry->d_sb;
struct gc_dvdfs_fst *fst = (struct gc_dvdfs_fst*)sb->s_fs_info;
sfs->f_type = sb->s_magic;
@@ -312,9 +313,9 @@
return -EINVAL;
}
-static struct super_block *gc_dvdfs_get_sb(struct file_system_type *fs_type,int flags,const char *dev_name,void *data)
+static int gc_dvdfs_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,gc_dvdfs_fill_super);
+ return get_sb_bdev(fs_type,flags,dev_name,data,gc_dvdfs_fill_super,mnt);
}
static struct file_system_type gcdvdfs_type = {
|
