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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
efs
/
super.c
diff --git
a/fs/efs/super.c
b/fs/efs/super.c
index
afc4891
..
dfebf21
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 = {
@@
-52,12
+52,12
@@
static struct pt_types sgi_pt_types[] = {
};
};
-static
kmem_cache_t
* efs_inode_cachep;
+static
struct kmem_cache
* efs_inode_cachep;
static struct inode *efs_alloc_inode(struct super_block *sb)
{
struct efs_inode_info *ei;
static struct inode *efs_alloc_inode(struct super_block *sb)
{
struct efs_inode_info *ei;
- ei = (struct efs_inode_info *)kmem_cache_alloc(efs_inode_cachep,
SLAB
_KERNEL);
+ ei = (struct efs_inode_info *)kmem_cache_alloc(efs_inode_cachep,
GFP
_KERNEL);
if (!ei)
return NULL;
return &ei->vfs_inode;
if (!ei)
return NULL;
return &ei->vfs_inode;
@@
-68,7
+68,7
@@
static void efs_destroy_inode(struct inode *inode)
kmem_cache_free(efs_inode_cachep, INODE_INFO(inode));
}
kmem_cache_free(efs_inode_cachep, INODE_INFO(inode));
}
-static void init_once(void * foo,
kmem_cache_t
* cachep, unsigned long flags)
+static void init_once(void * foo,
struct kmem_cache
* cachep, unsigned long flags)
{
struct efs_inode_info *ei = (struct efs_inode_info *) foo;
{
struct efs_inode_info *ei = (struct efs_inode_info *) foo;
@@
-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;
@@
-90,8
+90,7
@@
static int init_inodecache(void)
static void destroy_inodecache(void)
{
static void destroy_inodecache(void)
{
- if (kmem_cache_destroy(efs_inode_cachep))
- printk(KERN_INFO "efs_inode_cache: not all structures were freed\n");
+ kmem_cache_destroy(efs_inode_cachep);
}
static void efs_put_super(struct super_block *s)
}
static void efs_put_super(struct super_block *s)
@@
-248,11
+247,10
@@
static int efs_fill_super(struct super_block *s, void *d, int silent)
struct buffer_head *bh;
struct inode *root;
struct buffer_head *bh;
struct inode *root;
- sb = k
m
alloc(sizeof(struct efs_sb_info), GFP_KERNEL);
+ sb = k
z
alloc(sizeof(struct efs_sb_info), GFP_KERNEL);
if (!sb)
return -ENOMEM;
s->s_fs_info = sb;
if (!sb)
return -ENOMEM;
s->s_fs_info = sb;
- memset(sb, 0, sizeof(struct efs_sb_info));
s->s_magic = EFS_SUPER_MAGIC;
if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) {
s->s_magic = EFS_SUPER_MAGIC;
if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) {
@@
-322,8
+320,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 */