aboutsummaryrefslogtreecommitdiff
path: root/fs/jffs2/build.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-13 12:19:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-13 12:19:30 -0700
commit3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961 (patch)
treefecdaa69be5fc1f934909b89a6e3ae2c79241dfe /fs/jffs2/build.c
parenta61caa8523a76e497f6b2a05350c892bc5ee402c (diff)
parent6a8b4d319c52f8a3fdca46b185d001fbf0939911 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Diffstat (limited to 'fs/jffs2/build.c')
-rw-r--r--fs/jffs2/build.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c
index 3dd5394921c..97dc39796e2 100644
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: build.c,v 1.70 2005/02/28 08:21:05 dedekind Exp $
+ * $Id: build.c,v 1.71 2005/07/12 16:37:08 dedekind Exp $
*
*/
@@ -336,13 +336,6 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c)
c->blocks[i].bad_count = 0;
}
- init_MUTEX(&c->alloc_sem);
- init_MUTEX(&c->erase_free_sem);
- init_waitqueue_head(&c->erase_wait);
- init_waitqueue_head(&c->inocache_wq);
- spin_lock_init(&c->erase_completion_lock);
- spin_lock_init(&c->inocache_lock);
-
INIT_LIST_HEAD(&c->clean_list);
INIT_LIST_HEAD(&c->very_dirty_list);
INIT_LIST_HEAD(&c->dirty_list);