diff options
| author | Artem B. Bityuckiy | 2005-04-05 14:51:58 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2005-05-23 13:09:29 +0200 |
| commit | 894214d1a75745a283d5f1921125b3ad36d7ba26 (patch) | |
| tree | 70dd3913dfb671871348878b1f2a4c30427e2d73 /fs/jffs2/erase.c | |
| parent | [MTD] NAND: Move the NULL check into the calling function (diff) | |
| download | kernel-qcow2-linux-894214d1a75745a283d5f1921125b3ad36d7ba26.tar.gz kernel-qcow2-linux-894214d1a75745a283d5f1921125b3ad36d7ba26.tar.xz kernel-qcow2-linux-894214d1a75745a283d5f1921125b3ad36d7ba26.zip | |
[JFFS2] Fix race problems with wbuf.
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/erase.c')
| -rw-r--r-- | fs/jffs2/erase.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index bed6e1b8d824..bb47673c1e59 100644 --- 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(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; |