From: Ferenc Havasi <havasi@inf.u-szeged.hu>
Date: Fri, 19 May 2006 20:00:36 +0000 (+0100)
Subject: [JFFS2] Remove forgotten summary code
X-Git-Tag: v2.6.18-rc1~1105^2~81
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e4482fba21d15da99f39a13396d3361e810d199;p=linux-2.6

[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>
---

diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index eca0996def..352ada892f 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
 		}
 
 		kfree(sm);
-
-		ofs = jeb->offset;
-		prevofs = jeb->offset - 1;
 	}
 
 	buf_ofs = jeb->offset;
 
 	if (!buf_size) {
 		buf_len = c->sector_size;
-
-		if (jffs2_sum_active()) {
-			/* must reread because of summary test */
-			err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);
-			if (err)
-				return err;
-		}
-
 	} else {
 		buf_len = EMPTY_SCAN_SIZE(c->sector_size);
 		err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);