From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 9 Aug 2007 09:28:20 +0000 (+0800)
Subject: [JFFS2] Correct cleanmarker checks -- we should use only 8 bytes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09b3fba562ce366312b90a6f71d0b727b4d93ba9;p=linux-beck.git

[JFFS2] Correct cleanmarker checks -- we should use only 8 bytes

Commit a7a6ace1406f95c3edb8365788f85984377f3832 revamped the OOB
handling but accidentally switched to 12-byte cleanmarkers, which is
incompatible with what 'flash_eraseall -j' will do. So using
flash_eraseall -j and then trying to mount the 'empty' flash will fail,
because the cleanmarkers aren't recognised.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index ec99c8ec83ae..d1d4f27464ba 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -1008,8 +1008,8 @@ exit:
 
 #define NR_OOB_SCAN_PAGES 4
 
-/* For historical reasons we use only 12 bytes for OOB clean marker */
-#define OOB_CM_SIZE 12
+/* For historical reasons we use only 8 bytes for OOB clean marker */
+#define OOB_CM_SIZE 8
 
 static const struct jffs2_unknown_node oob_cleanmarker =
 {