From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 21 Jun 2006 19:57:41 +0000 (+0000)
Subject: move jffs2 end-of-filesystem detection to the generic 2.6 patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37334222488481b6b03a7ae5578dce4aba796ddc;p=openwrt%2Fstaging%2Fyousong.git

move jffs2 end-of-filesystem detection to the generic 2.6 patches

SVN-Revision: 4042
---

diff --git a/openwrt/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch b/openwrt/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
new file mode 100644
index 0000000000..b93efa68ab
--- /dev/null
+++ b/openwrt/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;
+ 
diff --git a/openwrt/target/linux/rb532-2.6/patches/140-jffs2_eofdetect.patch b/openwrt/target/linux/rb532-2.6/patches/140-jffs2_eofdetect.patch
deleted file mode 100644
index b93efa68ab..0000000000
--- a/openwrt/target/linux/rb532-2.6/patches/140-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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;
-