Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894214d1 authored by Artem B. Bityuckiy's avatar Artem B. Bityuckiy Committed by Thomas Gleixner
Browse files

[JFFS2] Fix race problems with wbuf. 



Signed-off-by: default avatarArtem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 22c60f5f

fs/jffs2/erase.c

+6 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: erase.c,v 1.74 2005/03/20 17:46:20 dedekind Exp $

 * $Id: erase.c,v 1.75 2005/04/05 12:51:54 dedekind Exp $

 *

 */
@@ -332,7 +332,11 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb 


			bad_offset = ofs;



			ret = jffs2_flash_read(c, ofs, readlen, &retlen, ebuf);

			if (!jffs2_is_writebuffered(c) || !jffs2_cleanmarker_oob(c))

				ret = c->mtd->read(c->mtd, ofs, readlen, &retlen, ebuf);

			else

				ret = c->mtd->read_ecc(c->mtd, ofs, readlen, &retlen, ebuf, NULL, c->oobinfo);



			if (ret) {

				printk(KERN_WARNING "Read of newly-erased block at 0x%08x failed: %d. Putting on bad_list\n", ofs, ret);

				goto bad;

fs/jffs2/wbuf.c

+4 −8
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: wbuf.c,v 1.91 2005/03/18 09:58:06 dedekind Exp $

 * $Id: wbuf.c,v 1.92 2005/04/05 12:51:54 dedekind Exp $

 *

 */
@@ -873,6 +873,7 @@ int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re 
		return c->mtd->read(c->mtd, ofs, len, retlen, buf);



	/* Read flash */

	down_read(&c->wbuf_sem);

	if (jffs2_cleanmarker_oob(c))

		ret = c->mtd->read_ecc(c->mtd, ofs, len, retlen, buf, NULL, c->oobinfo);

	else
@@ -896,16 +897,11 @@ int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re 


	/* if no writebuffer available or write buffer empty, return */

	if (!c->wbuf_pagesize || !c->wbuf_len)

		return ret;;

		goto exit;



	/* if we read in a different block, return */

	if (SECTOR_ADDR(ofs) != SECTOR_ADDR(c->wbuf_ofs))

		return ret;



	/* Lock only if we have reason to believe wbuf contains relevant data,

	   so that checking an erased block during wbuf recovery space allocation

	   does not deadlock. */

	down_read(&c->wbuf_sem);

		goto exit;



	if (ofs >= c->wbuf_ofs) {

		owbf = (ofs - c->wbuf_ofs);	/* offset in write buffer */