diff options
author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /fs/jffs2/erase.c | |
parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) |
Merge branch 'master' into next
Diffstat (limited to 'fs/jffs2/erase.c')
-rw-r--r-- | fs/jffs2/erase.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index c32b4a1ad6cf..a0244740b75a 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c | |||
@@ -480,13 +480,6 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb | |||
480 | return; | 480 | return; |
481 | 481 | ||
482 | filebad: | 482 | filebad: |
483 | mutex_lock(&c->erase_free_sem); | ||
484 | spin_lock(&c->erase_completion_lock); | ||
485 | /* Stick it on a list (any list) so erase_failed can take it | ||
486 | right off again. Silly, but shouldn't happen often. */ | ||
487 | list_move(&jeb->list, &c->erasing_list); | ||
488 | spin_unlock(&c->erase_completion_lock); | ||
489 | mutex_unlock(&c->erase_free_sem); | ||
490 | jffs2_erase_failed(c, jeb, bad_offset); | 483 | jffs2_erase_failed(c, jeb, bad_offset); |
491 | return; | 484 | return; |
492 | 485 | ||