diff options
author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-05-18 07:37:28 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 07:20:19 -0400 |
commit | a69dde91e8940b49bdc9920dd65ec02c6a51f85c (patch) | |
tree | f7e4359c4a7d6238a64ab104b0fbb11c4e123971 /fs/jffs2/super.c | |
parent | 4132ace8d6f1b57839048548a17a0265f889aa3e (diff) |
[JFFS2] Kill GC thread before cleanup
First kill GC thread, then start clearing the internal structures
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 3bfc121a4674..2cf14cf8b35a 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.105 2005/02/09 09:23:54 pavlov Exp $ | 10 | * $Id: super.c,v 1.106 2005/05/18 11:37:25 dedekind Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -270,8 +270,6 @@ static void jffs2_put_super (struct super_block *sb) | |||
270 | 270 | ||
271 | D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n")); | 271 | D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n")); |
272 | 272 | ||
273 | if (!(sb->s_flags & MS_RDONLY)) | ||
274 | jffs2_stop_garbage_collect_thread(c); | ||
275 | down(&c->alloc_sem); | 273 | down(&c->alloc_sem); |
276 | jffs2_flush_wbuf_pad(c); | 274 | jffs2_flush_wbuf_pad(c); |
277 | up(&c->alloc_sem); | 275 | up(&c->alloc_sem); |
@@ -292,6 +290,8 @@ static void jffs2_put_super (struct super_block *sb) | |||
292 | static void jffs2_kill_sb(struct super_block *sb) | 290 | static void jffs2_kill_sb(struct super_block *sb) |
293 | { | 291 | { |
294 | struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); | 292 | struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); |
293 | if (!(sb->s_flags & MS_RDONLY)) | ||
294 | jffs2_stop_garbage_collect_thread(c); | ||
295 | generic_shutdown_super(sb); | 295 | generic_shutdown_super(sb); |
296 | put_mtd_device(c->mtd); | 296 | put_mtd_device(c->mtd); |
297 | kfree(c); | 297 | kfree(c); |