diff options
Diffstat (limited to 'fs/jffs2/super.c')
-rw-r--r-- | fs/jffs2/super.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 6b2a441d2766..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.104 2004/11/23 15:37:31 gleixner 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); |
@@ -309,7 +309,7 @@ static int __init init_jffs2_fs(void) | |||
309 | int ret; | 309 | int ret; |
310 | 310 | ||
311 | printk(KERN_INFO "JFFS2 version 2.2." | 311 | printk(KERN_INFO "JFFS2 version 2.2." |
312 | #ifdef CONFIG_JFFS2_FS_NAND | 312 | #ifdef CONFIG_JFFS2_FS_WRITEBUFFER |
313 | " (NAND)" | 313 | " (NAND)" |
314 | #endif | 314 | #endif |
315 | " (C) 2001-2003 Red Hat, Inc.\n"); | 315 | " (C) 2001-2003 Red Hat, Inc.\n"); |