openwrt/upstream - upstream openwrt

about summary refs log tree commit diff stats

Mode	Name	Size
-rw-r--r--	.gitattributes	8	log stats plain
-rw-r--r--	.gitignore	224	log stats plain
-rw-r--r--	BSDmakefile	179	log stats plain
-rw-r--r--	Config.in	576	log stats plain
-rw-r--r--	LICENSE	17992	log stats plain
-rw-r--r--	Makefile	2659	log stats plain
-rw-r--r--	README	1272	log stats plain
d---------	config	174	log stats plain
d---------	docs	601	log stats plain
-rw-r--r--	feeds.conf.default	853	log stats plain
d---------	include	1490	log stats plain
d---------	package	334	log stats plain
-rw-r--r--	rules.mk	10678	log stats plain
d---------	scripts	1938	log stats plain
d---------	target	210	log stats plain
d---------	toolchain	408	log stats plain
d---------	tools	1760	log stats plain

unc__); + mtd_unlock(c->mtd, 0, c->mtd->size); + printk("done.\n"); + + printk("%s(): erasing all blocks after the end marker... ", __func__); + jffs2_erase_pending_blocks(c, -1); + printk("done.\n"); + } + dbg_fsbuild("pass 1 starting\n"); c->flags |= JFFS2_SB_FLAG_BUILDING; /* Now scan the directory tree, increasing nlink according to every dirent found. */ --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -148,8 +148,11 @@ int jffs2_scan_medium(struct jffs2_sb_in /* reset summary info for next eraseblock scan */ jffs2_sum_reset_collected(s); - ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset), - buf_size, s); + if (c->flags & (1 << 7)) + ret = BLK_STATE_ALLFF; + else + ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset), + buf_size, s); if (ret < 0) goto out; @@ -556,6 +559,17 @@ static int jffs2_scan_eraseblock (struct return err; } + if ((buf[0] == 0xde) && + (buf[1] == 0xad) && + (buf[2] == 0xc0) && + (buf[3] == 0xde)) { + /* end of filesystem. erase everything after this point */ + printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset); + c->flags |= (1 << 7); + + return BLK_STATE_ALLFF; + } + /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ ofs = 0; max_ofs = EMPTY_SCAN_SIZE(c->sector_size);