aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/super.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-01-17 18:34:51 -0500
committerDavid Woodhouse <dwmw2@infradead.org>2007-01-17 18:34:51 -0500
commit9cdf083f981b8d37b3212400a359368661385099 (patch)
treeaa15a6a08ad87e650dea40fb59b3180bef0d345b /fs/jffs2/super.c
parente499e01d234a31d59679b7b1e1cf628d917ba49a (diff)
parenta8b3485287731978899ced11f24628c927890e78 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs2/super.c')
-rw-r--r--fs/jffs2/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 590f60a897c1..08a0e6c49e61 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -29,12 +29,12 @@
29 29
30static void jffs2_put_super(struct super_block *); 30static void jffs2_put_super(struct super_block *);
31 31
32static kmem_cache_t *jffs2_inode_cachep; 32static struct kmem_cache *jffs2_inode_cachep;
33 33
34static struct inode *jffs2_alloc_inode(struct super_block *sb) 34static struct inode *jffs2_alloc_inode(struct super_block *sb)
35{ 35{
36 struct jffs2_inode_info *ei; 36 struct jffs2_inode_info *ei;
37 ei = (struct jffs2_inode_info *)kmem_cache_alloc(jffs2_inode_cachep, SLAB_KERNEL); 37 ei = (struct jffs2_inode_info *)kmem_cache_alloc(jffs2_inode_cachep, GFP_KERNEL);
38 if (!ei) 38 if (!ei)
39 return NULL; 39 return NULL;
40 return &ei->vfs_inode; 40 return &ei->vfs_inode;
@@ -45,7 +45,7 @@ static void jffs2_destroy_inode(struct inode *inode)
45 kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode)); 45 kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode));
46} 46}
47 47
48static void jffs2_i_init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) 48static void jffs2_i_init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
49{ 49{
50 struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo; 50 struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo;
51 51