git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
hpfs
/
super.c
diff --git
a/fs/hpfs/super.c
b/fs/hpfs/super.c
index
d72d8c8
..
f798480
100644
(file)
--- a/
fs/hpfs/super.c
+++ b/
fs/hpfs/super.c
@@
-135,8
+135,9
@@
static unsigned count_bitmaps(struct super_block *s)
return count;
}
return count;
}
-static int hpfs_statfs(struct
super_block *s
, struct kstatfs *buf)
+static int hpfs_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
{
+ struct super_block *s = dentry->d_sb;
struct hpfs_sb_info *sbi = hpfs_sb(s);
lock_kernel();
struct hpfs_sb_info *sbi = hpfs_sb(s);
lock_kernel();
@@
-662,10
+663,11
@@
bail0:
return -EINVAL;
}
return -EINVAL;
}
-static
struct super_block *
hpfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
hpfs_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, hpfs_fill_super);
+ return get_sb_bdev(fs_type, flags, dev_name, data, hpfs_fill_super,
+ mnt);
}
static struct file_system_type hpfs_fs_type = {
}
static struct file_system_type hpfs_fs_type = {