aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-06-21 19:57:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-06-21 19:57:41 +0000
commitdacd589fd3f4c02ef7e7b7371f9d6ce7f65508c8 (patch)
tree53670b13eff83c252e0d5616cf93547f712c635e /target/linux/generic-2.6/patches
parente9cf67bfb29dadb7de75a75d4735c6d3299fb640 (diff)
downloadupstream-dacd589fd3f4c02ef7e7b7371f9d6ce7f65508c8.tar.gz
upstream-dacd589fd3f4c02ef7e7b7371f9d6ce7f65508c8.tar.bz2
upstream-dacd589fd3f4c02ef7e7b7371f9d6ce7f65508c8.zip
move jffs2 end-of-filesystem detection to the generic 2.6 patches
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4042 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches')
-rw-r--r--target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
new file mode 100644
index 0000000000..b93efa68ab
--- /dev/null
+++ b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
@@ -0,0 +1,48 @@
+diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
+--- linux.old/fs/jffs2/scan.c 2006-05-31 02:31:44.000000000 +0200
++++ linux.dev/fs/jffs2/scan.c 2006-06-15 02:20:32.000000000 +0200
+@@ -120,8 +120,11 @@
+ /* 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;
+@@ -222,6 +225,12 @@
+ }
+ }
+
++ if (c->flags & (1 << 7)) {
++ printk("jffs2_scan_medium(): erasing all blocks after the end marker...\n");
++ jffs2_erase_pending_blocks(c, -1);
++ printk("jffs2_scan_medium(): done.\n");
++ }
++
+ if (jffs2_sum_active() && s)
+ kfree(s);
+
+@@ -389,6 +398,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("jffs2_scan_eraseblock(): End of filesystem marker found at 0x%x\n", jeb->offset);
++ c->flags |= (1 << 7);
++
++ return BLK_STATE_ALLFF;
++ }
++
+ /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ ofs = 0;
+