summaryrefslogtreecommitdiff
path: root/target/linux/mediatek/patches/1010-jffs2-eof.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mediatek/patches/1010-jffs2-eof.patch')
-rw-r--r--target/linux/mediatek/patches/1010-jffs2-eof.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches/1010-jffs2-eof.patch b/target/linux/mediatek/patches/1010-jffs2-eof.patch
new file mode 100644
index 0000000..0a86c63
--- /dev/null
+++ b/target/linux/mediatek/patches/1010-jffs2-eof.patch
@@ -0,0 +1,58 @@
+Index: linux-3.10.20/fs/jffs2/build.c
+===================================================================
+--- linux-3.10.20.orig/fs/jffs2/build.c
++++ linux-3.10.20/fs/jffs2/build.c
+@@ -114,6 +114,17 @@ static int jffs2_build_filesystem(struct
+ dbg_fsbuild("scanned flash completely\n");
+ jffs2_dbg_dump_block_lists_nolock(c);
+
++ if (c->flags & (1 << 7)) {
++ printk("%s(): unlocking the mtd device... ", __func__);
++ if (c->mtd->_unlock)
++ c->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. */
+Index: linux-3.10.20/fs/jffs2/scan.c
+===================================================================
+--- linux-3.10.20.orig/fs/jffs2/scan.c
++++ linux-3.10.20/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);