aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-06-02 08:22:56 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-06-02 08:22:56 +0000
commit7cce2d8fc39a7bbcdcf8755ad331409b0a103103 (patch)
treec5089f65708dd1656748c8079574e68096d53242 /target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
parent40720b6d2027e49c59718c3650c93bc6771a38b3 (diff)
downloadupstream-7cce2d8fc39a7bbcdcf8755ad331409b0a103103.tar.gz
upstream-7cce2d8fc39a7bbcdcf8755ad331409b0a103103.tar.bz2
upstream-7cce2d8fc39a7bbcdcf8755ad331409b0a103103.zip
add generic 2.6.26 patches/files
SVN-Revision: 11323
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
new file mode 100644
index 0000000000..5053401f11
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
@@ -0,0 +1,56 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -105,6 +105,17 @@
+ 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. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -142,9 +142,12 @@
+
+ /* 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;
+@@ -545,6 +548,17 @@
+ 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;
+