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
d8d5ea9
..
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 = {
@@
-81,7
+81,7
@@
static int init_inodecache(void)
{
efs_inode_cachep = kmem_cache_create("efs_inode_cache",
sizeof(struct efs_inode_info),
{
efs_inode_cachep = kmem_cache_create("efs_inode_cache",
sizeof(struct efs_inode_info),
- 0, SLAB_RECLAIM_ACCOUNT,
+ 0, SLAB_RECLAIM_ACCOUNT
|SLAB_MEM_SPREAD
,
init_once, NULL);
if (efs_inode_cachep == NULL)
return -ENOMEM;
init_once, NULL);
if (efs_inode_cachep == NULL)
return -ENOMEM;
@@
-222,12
+222,13
@@
static efs_block_t efs_validate_vh(struct volume_header *vh) {
sblock);
#endif
}
sblock);
#endif
}
- return
(sblock)
;
+ return
sblock
;
}
static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) {
}
static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) {
- if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic))) return -1;
+ if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic)))
+ return -1;
sb->fs_magic = be32_to_cpu(super->fs_magic);
sb->total_blocks = be32_to_cpu(super->fs_size);
sb->fs_magic = be32_to_cpu(super->fs_magic);
sb->total_blocks = be32_to_cpu(super->fs_size);
@@
-321,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 */