diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 21:06:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 21:06:21 +0200 |
| commit | 3d58f48ba05caed9118bce62b3047f8683438835 (patch) | |
| tree | 94c911034f0e14ded73d3e9e6e9f8e22b6cad822 /fs/jffs2 | |
| parent | abfe0af9813153bae8c85d9bac966bafcb8ddab1 (diff) | |
| parent | d9244b5d2fbfe9fa540024b410047af13ceec90f (diff) | |
Merge branch 'linus' into irq/numa
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/jffs2')
| -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 c32b4a1ad6c..a0244740b75 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; |