X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Fjffs2%2Fscan.c;h=46f870d1cc36ffaca178be3e62c600186e23d7f6;hb=db8cc27b804f89e8fd5f9d5385161956a777c471;hp=696686cc206e1d807df1b6706a4a1a54f3f6b2bf;hpb=ef4b18e2af09b69b5a183ad611f5965ef1766be4;p=cascardo%2Flinux.git

diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 696686cc206e..46f870d1cc36 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -260,7 +260,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 			ret = -EIO;
 			goto out;
 		}
-		jffs2_erase_pending_trigger(c);
+		spin_lock(&c->erase_completion_lock);
+		jffs2_garbage_collect_trigger(c);
+		spin_unlock(&c->erase_completion_lock);
 	}
 	ret = 0;
  out: