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
/
hfs
/
super.c
diff --git
a/fs/hfs/super.c
b/fs/hfs/super.c
index
4af327a
..
a369879
100644
(file)
--- a/
fs/hfs/super.c
+++ b/
fs/hfs/super.c
@@
-24,7
+24,7
@@
#include "hfs_fs.h"
#include "btree.h"
#include "hfs_fs.h"
#include "btree.h"
-static
kmem_cache_t
*hfs_inode_cachep;
+static
struct kmem_cache
*hfs_inode_cachep;
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
@@
-145,7
+145,7
@@
static struct inode *hfs_alloc_inode(struct super_block *sb)
{
struct hfs_inode_info *i;
{
struct hfs_inode_info *i;
- i = kmem_cache_alloc(hfs_inode_cachep,
SLAB
_KERNEL);
+ i = kmem_cache_alloc(hfs_inode_cachep,
GFP
_KERNEL);
return i ? &i->vfs_inode : NULL;
}
return i ? &i->vfs_inode : NULL;
}
@@
-356,11
+356,10
@@
static int hfs_fill_super(struct super_block *sb, void *data, int silent)
struct inode *root_inode;
int res;
struct inode *root_inode;
int res;
- sbi = k
m
alloc(sizeof(struct hfs_sb_info), GFP_KERNEL);
+ sbi = k
z
alloc(sizeof(struct hfs_sb_info), GFP_KERNEL);
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
- memset(sbi, 0, sizeof(struct hfs_sb_info));
INIT_HLIST_HEAD(&sbi->rsrc_inodes);
res = -EINVAL;
INIT_HLIST_HEAD(&sbi->rsrc_inodes);
res = -EINVAL;
@@
-397,6
+396,7
@@
static int hfs_fill_super(struct super_block *sb, void *data, int silent)
if (!root_inode)
goto bail_no_root;
if (!root_inode)
goto bail_no_root;
+ res = -ENOMEM;
sb->s_root = d_alloc_root(root_inode);
if (!sb->s_root)
goto bail_iput;
sb->s_root = d_alloc_root(root_inode);
if (!sb->s_root)
goto bail_iput;
@@
-430,7
+430,7
@@
static struct file_system_type hfs_fs_type = {
.fs_flags = FS_REQUIRES_DEV,
};
.fs_flags = FS_REQUIRES_DEV,
};
-static void hfs_init_once(void *p,
kmem_cache_t
*cachep, unsigned long flags)
+static void hfs_init_once(void *p,
struct kmem_cache
*cachep, unsigned long flags)
{
struct hfs_inode_info *i = p;
{
struct hfs_inode_info *i = p;
@@
-456,8
+456,7
@@
static int __init init_hfs_fs(void)
static void __exit exit_hfs_fs(void)
{
unregister_filesystem(&hfs_fs_type);
static void __exit exit_hfs_fs(void)
{
unregister_filesystem(&hfs_fs_type);
- if (kmem_cache_destroy(hfs_inode_cachep))
- printk(KERN_ERR "hfs_inode_cache: not all structures were freed\n");
+ kmem_cache_destroy(hfs_inode_cachep);
}
module_init(init_hfs_fs)
}
module_init(init_hfs_fs)