diff options
| author | Joakim Tjernlund <Joakim.Tjernlund@transmode.se> | 2007-06-01 15:14:09 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-06-28 18:41:22 +0100 |
| commit | fab2c399129273713b7dcc6a54cef17ca124a47f (patch) | |
| tree | 738297917ecf605447fe29755b2b4053fd16a783 /fs/jffs2 | |
| parent | 7eafaed55f4b8599cfe55449a6ed88d3693954de (diff) | |
| download | linux-stable-fab2c399129273713b7dcc6a54cef17ca124a47f.tar.gz linux-stable-fab2c399129273713b7dcc6a54cef17ca124a47f.tar.bz2 linux-stable-fab2c399129273713b7dcc6a54cef17ca124a47f.zip | |
[JFFS2] Use point(), if available, to check newly erased blocks.
Faster and won't trash the D-cache.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/erase.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index bdab9bc51d65..e9e3c2c330cc 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c @@ -317,6 +317,33 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl size_t retlen; int ret = -EIO; + if (c->mtd->point) { + unsigned long *wordebuf; + + ret = c->mtd->point(c->mtd, jeb->offset, c->sector_size, &retlen, (unsigned char **)&ebuf); + if (ret) { + D1(printk(KERN_DEBUG "MTD point failed %d\n", ret)); + goto do_flash_read; + } + if (retlen < c->sector_size) { + /* Don't muck about if it won't let us point to the whole erase sector */ + D1(printk(KERN_DEBUG "MTD point returned len too short: 0x%zx\n", retlen)); + c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size); + goto do_flash_read; + } + wordebuf = ebuf-sizeof(*wordebuf); + retlen /= sizeof(*wordebuf); + do { + if (*++wordebuf != ~0) + break; + } while(--retlen); + c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size); + if (retlen) + printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08x\n", + *wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf)); + return 0; + } + do_flash_read: ebuf = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!ebuf) { printk(KERN_WARNING "Failed to allocate page buffer for verifying erase at 0x%08x. Refiling\n", jeb->offset); |