From 5c123a647d71ad1ee0fee9721ddeaedbefb69d4e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 29 Nov 2005 16:57:17 +0100 Subject: [PATCH] --- yaml --- r: 14764 b: refs/heads/master c: 21eeb7aa116b1f59fc23339521173cbb13e57f1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jffs2/fs.c | 2 ++ trunk/fs/jffs2/super.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d43d5721d6c1..21a5c2f1943f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc4117f8767203927e78b92e9e5b3ddb71d6a84d +refs/heads/master: 21eeb7aa116b1f59fc23339521173cbb13e57f1a diff --git a/trunk/fs/jffs2/fs.c b/trunk/fs/jffs2/fs.c index 543420665c5b..d0fcc5f3497e 100644 --- a/trunk/fs/jffs2/fs.c +++ b/trunk/fs/jffs2/fs.c @@ -234,6 +234,7 @@ void jffs2_read_inode (struct inode *inode) c = JFFS2_SB_INFO(inode->i_sb); jffs2_init_inode_info(f); + down(&f->sem); ret = jffs2_do_read_inode(c, f, inode->i_ino, &latest_node); @@ -400,6 +401,7 @@ struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_i f = JFFS2_INODE_INFO(inode); jffs2_init_inode_info(f); + down(&f->sem); memset(ri, 0, sizeof(*ri)); /* Set OS-specific defaults for new inodes */ diff --git a/trunk/fs/jffs2/super.c b/trunk/fs/jffs2/super.c index 9e0b5458d9c0..93883817cbd0 100644 --- a/trunk/fs/jffs2/super.c +++ b/trunk/fs/jffs2/super.c @@ -51,7 +51,7 @@ static void jffs2_i_init_once(void * foo, kmem_cache_t * cachep, unsigned long f if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR) { - init_MUTEX_LOCKED(&ei->sem); + init_MUTEX(&ei->sem); inode_init_once(&ei->vfs_inode); } }