diff options
Diffstat (limited to 'fs/jffs2/super.c')
-rw-r--r-- | fs/jffs2/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index bc4b8106a490..7deb78254021 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
@@ -28,12 +28,12 @@ | |||
28 | 28 | ||
29 | static void jffs2_put_super(struct super_block *); | 29 | static void jffs2_put_super(struct super_block *); |
30 | 30 | ||
31 | static kmem_cache_t *jffs2_inode_cachep; | 31 | static struct kmem_cache *jffs2_inode_cachep; |
32 | 32 | ||
33 | static struct inode *jffs2_alloc_inode(struct super_block *sb) | 33 | static struct inode *jffs2_alloc_inode(struct super_block *sb) |
34 | { | 34 | { |
35 | struct jffs2_inode_info *ei; | 35 | struct jffs2_inode_info *ei; |
36 | ei = (struct jffs2_inode_info *)kmem_cache_alloc(jffs2_inode_cachep, SLAB_KERNEL); | 36 | ei = (struct jffs2_inode_info *)kmem_cache_alloc(jffs2_inode_cachep, GFP_KERNEL); |
37 | if (!ei) | 37 | if (!ei) |
38 | return NULL; | 38 | return NULL; |
39 | return &ei->vfs_inode; | 39 | return &ei->vfs_inode; |
@@ -44,7 +44,7 @@ static void jffs2_destroy_inode(struct inode *inode) | |||
44 | kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode)); | 44 | kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode)); |
45 | } | 45 | } |
46 | 46 | ||
47 | static void jffs2_i_init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) | 47 | static void jffs2_i_init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) |
48 | { | 48 | { |
49 | struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo; | 49 | struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo; |
50 | 50 | ||