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
/
efs
/
super.c
diff --git
a/fs/efs/super.c
b/fs/efs/super.c
index
dff623e
..
8ac2462
100644
(file)
--- a/
fs/efs/super.c
+++ b/
fs/efs/super.c
@@
-15,13
+15,13
@@
#include <linux/buffer_head.h>
#include <linux/vfs.h>
#include <linux/buffer_head.h>
#include <linux/vfs.h>
-static int efs_statfs(struct
super_block *s
, struct kstatfs *buf);
+static int efs_statfs(struct
dentry *dentry
, struct kstatfs *buf);
static int efs_fill_super(struct super_block *s, void *d, int silent);
static int efs_fill_super(struct super_block *s, void *d, int silent);
-static
struct super_block *
efs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
efs_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, efs_fill_super);
+ return get_sb_bdev(fs_type, flags, dev_name, data, efs_fill_super
, mnt
);
}
static struct file_system_type efs_fs_type = {
}
static struct file_system_type efs_fs_type = {
@@
-322,8
+322,8
@@
out_no_fs:
return -EINVAL;
}
return -EINVAL;
}
-static int efs_statfs(struct
super_block *s
, struct kstatfs *buf) {
- struct efs_sb_info *sb = SUPER_INFO(
s
);
+static int efs_statfs(struct
dentry *dentry
, struct kstatfs *buf) {
+ struct efs_sb_info *sb = SUPER_INFO(
dentry->d_sb
);
buf->f_type = EFS_SUPER_MAGIC; /* efs magic number */
buf->f_bsize = EFS_BLOCKSIZE; /* blocksize */
buf->f_type = EFS_SUPER_MAGIC; /* efs magic number */
buf->f_bsize = EFS_BLOCKSIZE; /* blocksize */