diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 17:52:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 17:52:13 +0200 |
| commit | 3218911f839b6c85acbf872ad264ea69aa4d89ad (patch) | |
| tree | d0aefbb2f1d0ea4d2e8f59be99492c5393715184 /fs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | jffs2: Fix corruption when flash erase/write failure (diff) | |
| download | linux-3218911f839b6c85acbf872ad264ea69aa4d89ad.tar.xz linux-3218911f839b6c85acbf872ad264ea69aa4d89ad.zip | |
Merge git://git.infradead.org/~dwmw2/mtd-2.6.30
* git://git.infradead.org/~dwmw2/mtd-2.6.30:
jffs2: Fix corruption when flash erase/write failure
mtd: MXC NAND driver fixes (v5)
Diffstat (limited to 'fs')
| -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 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; |