JFFS2: fix deadlock on error path

From: Artem Bityutskiy <[email protected]>
Subject: [PATCH] JFFS2: fix deadlock on error path

When the MTD driver returns write failure, the following deadlock occures:

We are in __jffs2_flush_wbuf(), we hold &c->wbuf_sem. Write failure. jffs2_wbuf_recover()->jffs2_reserve_space_gc()->jffs2_do_reserve_space() ->jffs2_erase_pending_blocks()->jffs2_flash_read()

and it tries to lock &c->wbuf_sem again. Deadlock.

---
 fs/jffs2/erase.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index ad01210..6b1f7be 100644
@@ -333,7 +333,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
 
 		*bad_offset = ofs;
 
-		ret = jffs2_flash_read(c, ofs, readlen, &retlen, ebuf);
+		ret = c->mtd->read(c->mtd, ofs, readlen, &retlen, ebuf);
 		if (ret) {
 			printk(KERN_WARNING "Read of newly-erased block at 0x%08x failed: %d. Putting on bad_list\n", ofs, ret);
 			goto fail;

1.4.4.2

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

David,

please, send this patch to Linus as it is critical enough.

Best regards,
Artem Bityutskiy (Битюцкий Артём)