---

yaml --- r: 145382 b: refs/heads/master c: 81e2962 h: refs/heads/master v: v3
git-mirror · May 29, 2009 · 7e2bd03 · 7e2bd03
1 parent 9221d9c
commit 7e2bd03
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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;