Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95733
b: refs/heads/master
c: 4e571ab
h: refs/heads/master
i:
  95731: ec316db
v: v3
  • Loading branch information
David Woodhouse committed May 1, 2008
1 parent 84622d7 commit e1f3dfb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fb96c00819c28860fd10137f1c63f7c48dec252b
refs/heads/master: 4e571aba7bb25a3a069a7b88c0f63fe5a14c05c6
15 changes: 8 additions & 7 deletions trunk/fs/jffs2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit e1f3dfb

Please sign in to comment.