From e1f3dfb1ce4f8a337b423e88cbba065156e7996e Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 1 May 2008 12:28:04 +0100 Subject: [PATCH] --- yaml --- r: 95733 b: refs/heads/master c: 4e571aba7bb25a3a069a7b88c0f63fe5a14c05c6 h: refs/heads/master i: 95731: ec316dbe76a4fcba8728d5bbd170f8da74fbe7c4 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/super.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fff07ebe97ce..eff93a62dbfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb96c00819c28860fd10137f1c63f7c48dec252b +refs/heads/master: 4e571aba7bb25a3a069a7b88c0f63fe5a14c05c6 diff --git a/trunk/fs/jffs2/super.c b/trunk/fs/jffs2/super.c index f3353df178e7..7da69eae49e4 100644 --- a/trunk/fs/jffs2/super.c +++ b/trunk/fs/jffs2/super.c @@ -31,11 +31,12 @@ static struct kmem_cache *jffs2_inode_cachep; static struct inode *jffs2_alloc_inode(struct super_block *sb) { - struct jffs2_inode_info *ei; - ei = (struct jffs2_inode_info *)kmem_cache_alloc(jffs2_inode_cachep, GFP_KERNEL); - if (!ei) + struct jffs2_inode_info *f; + + f = kmem_cache_alloc(jffs2_inode_cachep, GFP_KERNEL); + if (!f) return NULL; - return &ei->vfs_inode; + return &f->vfs_inode; } static void jffs2_destroy_inode(struct inode *inode) @@ -45,10 +46,10 @@ static void jffs2_destroy_inode(struct inode *inode) static void jffs2_i_init_once(struct kmem_cache *cachep, void *foo) { - struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo; + struct jffs2_inode_info *f = foo; - mutex_init(&ei->sem); - inode_init_once(&ei->vfs_inode); + mutex_init(&f->sem); + inode_init_once(&f->vfs_inode); } static int jffs2_sync_fs(struct super_block *sb, int wait)