diff options
author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-12 12:37:12 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-12 18:02:33 -0400 |
commit | b62205986a73a40e4fc174d2ef668e3895e925bc (patch) | |
tree | e5754d64dcdf508dd4f3602135c963990d261411 /fs/jffs2/super.c | |
parent | e4fef6618992bea48b7856ebbd236796b744964f (diff) |
[JFFS2] Init locks early during mount
In case of a mount error locks might be uninitialized but
accessed by the resulting call to jffs2_kill_sb().
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/super.c')
-rw-r--r-- | fs/jffs2/super.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 2cf14cf8b35a..aaf9475cfb6a 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: super.c,v 1.106 2005/05/18 11:37:25 dedekind Exp $ | 10 | * $Id: super.c,v 1.107 2005/07/12 16:37:08 dedekind Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -140,6 +140,15 @@ static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type, | |||
140 | D1(printk(KERN_DEBUG "jffs2_get_sb_mtd(): New superblock for device %d (\"%s\")\n", | 140 | D1(printk(KERN_DEBUG "jffs2_get_sb_mtd(): New superblock for device %d (\"%s\")\n", |
141 | mtd->index, mtd->name)); | 141 | mtd->index, mtd->name)); |
142 | 142 | ||
143 | /* Initialize JFFS2 superblock locks, the further initialization will be | ||
144 | * done later */ | ||
145 | init_MUTEX(&c->alloc_sem); | ||
146 | init_MUTEX(&c->erase_free_sem); | ||
147 | init_waitqueue_head(&c->erase_wait); | ||
148 | init_waitqueue_head(&c->inocache_wq); | ||
149 | spin_lock_init(&c->erase_completion_lock); | ||
150 | spin_lock_init(&c->inocache_lock); | ||
151 | |||
143 | sb->s_op = &jffs2_super_operations; | 152 | sb->s_op = &jffs2_super_operations; |
144 | sb->s_flags = flags | MS_NOATIME; | 153 | sb->s_flags = flags | MS_NOATIME; |
145 | 154 | ||