jffs2: Stop triggering block erases from jffs2_write_super()

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=9723152ad1efb844445e63f052e6d39e85e11649
Commit:     9723152ad1efb844445e63f052e6d39e85e11649
Parent:     64a5c2eb82d2a626116fde8a0ea3bb39a3f4f233
Author:     Joakim Tjernlund <joakim.tjernlund at transmode.se>
AuthorDate: Wed May 19 17:16:11 2010 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed May 19 17:16:11 2010 +0100

    jffs2: Stop triggering block erases from jffs2_write_super()
    
    This is the culmination of this sequence of patches. By moving the block
    erasing from jffs2_write_super() into the GC code, we avoid huge
    latencies on unmount where it waits for _all_ pending blocks to be
    erased, and we allow better control for time-critical tasks by stopping
    the GC thread.
    
    Signed-off-by: Joakim Tjernlund <joakim.tjernlund at transmode.se>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 fs/jffs2/super.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 12cc967..511e2d6 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -63,10 +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"));
-		spin_lock(&c->erase_completion_lock);
-		jffs2_garbage_collect_trigger(c);
-		spin_unlock(&c->erase_completion_lock);
-		jffs2_erase_pending_blocks(c, 0);
 		jffs2_flush_wbuf_gc(c, 0);
 	}