Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e4482fb authored by Ferenc Havasi's avatar Ferenc Havasi Committed by David Woodhouse
Browse files

[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: default avatarFerenc Havasi <havasi@inf.u-szeged.hu>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent aef9ab47

fs/jffs2/scan.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -365,23 +365,12 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo 
		}

		}





		kfree(sm);

		kfree(sm);



		ofs = jeb->offset;

		prevofs = jeb->offset - 1;

	}

	}





	buf_ofs = jeb->offset;

	buf_ofs = jeb->offset;





	if (!buf_size) {

	if (!buf_size) {

		buf_len = c->sector_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 {

	} else {

		buf_len = EMPTY_SCAN_SIZE(c->sector_size);

		buf_len = EMPTY_SCAN_SIZE(c->sector_size);

		err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);

		err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);