diff options
| author | Adrian Hunter <ext-adrian.hunter@nokia.com> | 2007-04-04 13:47:53 +0300 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-17 13:56:44 -0400 |
| commit | 7f762ab24ca2215b69a1395b5b58877f8282a089 (patch) | |
| tree | 38774bcd57912c5d6506959c86ee639cdeebe7b3 /fs | |
| parent | 99c2594f0e13de1ca84f97efc3f9e7bc49f91e11 (diff) | |
| download | op-kernel-dev-7f762ab24ca2215b69a1395b5b58877f8282a089.zip op-kernel-dev-7f762ab24ca2215b69a1395b5b58877f8282a089.tar.gz | |
[JFFS2] Disable summary after wbuf recovery
After a write error, any data in the write buffer must
be relocated. This is handled by the jffs2_wbuf_recover
function. This function does not fix up the erase block
summary information that is collected for writing at the
end of the block, which results in an incorrect summary
(or BUG if the summary was found to be empty).
As the summary is not essential (it is an optimisation),
it may be disabled for the current erase block when this
situation arises. This patch does that.
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/wbuf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c index 4fac6dd..f9da0e7 100644 --- a/fs/jffs2/wbuf.c +++ b/fs/jffs2/wbuf.c @@ -345,6 +345,9 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c) return; } + /* The summary is not recovered, so it must be disabled for this erase block */ + jffs2_sum_disable_collecting(c->summary); + ret = jffs2_prealloc_raw_node_refs(c, c->nextblock, nr_refile); if (ret) { printk(KERN_WARNING "Failed to allocate node refs for wbuf recovery. Data loss ensues.\n"); |
