From 7e2bd037ad947bdece963dc55f3afd43d41bc6cf Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Thu, 28 May 2009 17:43:59 +0200
Subject: [PATCH] --- yaml --- r: 145382 b: refs/heads/master c:
 81e2962801bbb4e740c501ca687d5cb857929c04 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/jffs2/erase.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 27c4f5f56cda..df2c4184873c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8541c1180a355c4da283fc6b03a92c0233823c1b
+refs/heads/master: 81e2962801bbb4e740c501ca687d5cb857929c04
diff --git a/trunk/fs/jffs2/erase.c b/trunk/fs/jffs2/erase.c
index c32b4a1ad6cf..a0244740b75a 100644
--- a/trunk/fs/jffs2/erase.c
+++ b/trunk/fs/jffs2/erase.c
@@ -480,13 +480,6 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
 	return;
 
 filebad:
-	mutex_lock(&c->erase_free_sem);
-	spin_lock(&c->erase_completion_lock);
-	/* Stick it on a list (any list) so erase_failed can take it
-	   right off again.  Silly, but shouldn't happen often. */
-	list_move(&jeb->list, &c->erasing_list);
-	spin_unlock(&c->erase_completion_lock);
-	mutex_unlock(&c->erase_free_sem);
 	jffs2_erase_failed(c, jeb, bad_offset);
 	return;