tree 70dd3913dfb671871348878b1f2a4c30427e2d73
parent 22c60f5fb7b8184a2d00a607f965b54c586fb40e
author Artem B. Bityuckiy <[EMAIL PROTECTED]> Tue, 05 Apr 2005 13:51:58 +0100
committer Thomas Gleixner <[EMAIL PROTECTED]> Mon, 23 May 2005 13:09:29 +0200
[JFFS2] Fix race problems with wbuf.
Signed-off-by: Artem B. Bityuckiy <[EMAIL PROTECTED]>
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
fs/jffs2/erase.c | 8 ++++++--
fs/jffs2/wbuf.c | 12 ++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -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(stru
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;
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -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_inf
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_inf
/* 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 */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
