aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-20 15:08:42 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-20 15:08:42 -0400
commitfb9fbbcc9389edabb172ac1b6419c01e32046787 (patch)
tree9e5dd2385010324a00edbf6d5c8c8a8565970a9d /fs/jffs2
parentf1f9671bd8f7d2ac6a918bad806ab5bdc0daaf4e (diff)
[JFFS2] Correct accounting of erroneous cleanmarkers and failed summaries.
It should all be counted as dirty space, not wasted and _definitely_ not unchecked. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/summary.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 912189762323..95b5bf8f4a99 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -617,11 +617,11 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
617 if (je32_to_cpu(summary->cln_mkr) != c->cleanmarker_size) { 617 if (je32_to_cpu(summary->cln_mkr) != c->cleanmarker_size) {
618 dbg_summary("CLEANMARKER node has totlen 0x%x != normal 0x%x\n", 618 dbg_summary("CLEANMARKER node has totlen 0x%x != normal 0x%x\n",
619 je32_to_cpu(summary->cln_mkr), c->cleanmarker_size); 619 je32_to_cpu(summary->cln_mkr), c->cleanmarker_size);
620 UNCHECKED_SPACE(PAD(je32_to_cpu(summary->cln_mkr))); 620 DIRTY_SPACE(PAD(je32_to_cpu(summary->cln_mkr)));
621 } else if (jeb->first_node) { 621 } else if (jeb->first_node) {
622 dbg_summary("CLEANMARKER node not first node in block " 622 dbg_summary("CLEANMARKER node not first node in block "
623 "(0x%08x)\n", jeb->offset); 623 "(0x%08x)\n", jeb->offset);
624 UNCHECKED_SPACE(PAD(je32_to_cpu(summary->cln_mkr))); 624 DIRTY_SPACE(PAD(je32_to_cpu(summary->cln_mkr)));
625 } else { 625 } else {
626 struct jffs2_raw_node_ref *marker_ref = jffs2_alloc_raw_node_ref(); 626 struct jffs2_raw_node_ref *marker_ref = jffs2_alloc_raw_node_ref();
627 627
@@ -800,7 +800,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock
800 infosize, jeb->offset + c->sector_size - jeb->free_size, ret, retlen); 800 infosize, jeb->offset + c->sector_size - jeb->free_size, ret, retlen);
801 801
802 c->summary->sum_size = JFFS2_SUMMARY_NOSUM_SIZE; 802 c->summary->sum_size = JFFS2_SUMMARY_NOSUM_SIZE;
803 WASTED_SPACE(infosize); 803 DIRTY_SPACE(infosize);
804 804
805 return 1; 805 return 1;
806 } 806 }