Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / fs / jffs2 / super.c

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 9a80e8e595d0d462aa38b2d47aee57f0ea10a07e..511e2d609d129f6171bf18bdbe5c9c8c09123d12 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -63,8 +63,6 @@ static void jffs2_write_super(struct super_block *sb)
 
        if (!(sb->s_flags & MS_RDONLY)) {
                D1(printk(KERN_DEBUG "jffs2_write_super()\n"));
-               jffs2_garbage_collect_trigger(c);
-               jffs2_erase_pending_blocks(c, 0);
                jffs2_flush_wbuf_gc(c, 0);
        }