aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerenc Havasi <havasi@inf.u-szeged.hu>2006-05-19 16:00:36 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-19 16:00:36 -0400
commit8e4482fba21d15da99f39a13396d3361e810d199 (patch)
tree8dbfaedd9c0326040e8ac7e98b4d2c297b9151a0
parentaef9ab47841af45888d950baa6448072cc70bdd5 (diff)
[JFFS2] Remove forgotten summary code
Remove forgotten lines from jffs2_scan_eraseblock() which were unnecessary and may cause problem in some environments. Thanks to Alexander Belyakov <alexander.belyakov@intel.com>. Signed-off-by: Ferenc Havasi <havasi@inf.u-szeged.hu> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--fs/jffs2/scan.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index eca0996def60..352ada892f3e 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -365,23 +365,12 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
365 } 365 }
366 366
367 kfree(sm); 367 kfree(sm);
368
369 ofs = jeb->offset;
370 prevofs = jeb->offset - 1;
371 } 368 }
372 369
373 buf_ofs = jeb->offset; 370 buf_ofs = jeb->offset;
374 371
375 if (!buf_size) { 372 if (!buf_size) {
376 buf_len = c->sector_size; 373 buf_len = c->sector_size;
377
378 if (jffs2_sum_active()) {
379 /* must reread because of summary test */
380 err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);
381 if (err)
382 return err;
383 }
384
385 } else { 374 } else {
386 buf_len = EMPTY_SCAN_SIZE(c->sector_size); 375 buf_len = EMPTY_SCAN_SIZE(c->sector_size);
387 err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len); 376 err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);