diff options
| author |   Vitaly Wool <vwool@ru.mvista.com> | 2007-03-06 17:01:04 +0300 |
|---|---|---|
| committer |   David Woodhouse <dwmw2@infradead.org> | 2007-03-08 09:18:31 +0000 |
| commit | 180bfb31fef77815d56b875d4f28d353fdc87bf8 (patch) | |
| tree | 67a7fbae2581e97639473d76dc5a359556c090db /fs | |
| parent | [MTD] [NAND] make oobavail public (diff) | |
| download | linux-dev-180bfb31fef77815d56b875d4f28d353fdc87bf8.tar.xz linux-dev-180bfb31fef77815d56b875d4f28d353fdc87bf8.zip | |
[JFFS2] Fix writebuffer recovery in the first page of a block
For the case when nand_write_page fail with -EIO for the first page in an
eraseblock, jffs2_wbuf_recover ends up producing a BUG in jffs2_block_refile
as jeb->first_node is not yet set up (it's set up later in jffs2_wbuf_recover).
This BUG is not really a bug; it's just jffs2_wbuf_recover calling
jffs2_block_refile with the wrong second parameter.
This patch takes care of this situation.
Signed-off-by: Vitaly Wool <vwool@ru.mvista.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/wbuf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c index de718e3a1692..23028b384418 100644 --- a/fs/jffs2/wbuf.c +++ b/fs/jffs2/wbuf.c @@ -238,7 +238,10 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c) jeb = &c->blocks[c->wbuf_ofs / c->sector_size]; spin_lock(&c->erase_completion_lock); - jffs2_block_refile(c, jeb, REFILE_NOTEMPTY); + if (c->wbuf_ofs % c->mtd->erasesize) + jffs2_block_refile(c, jeb, REFILE_NOTEMPTY); + else + jffs2_block_refile(c, jeb, REFILE_ANYWAY); spin_unlock(&c->erase_completion_lock); BUG_ON(!ref_obsolete(jeb->last_node)); |