aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-08-09 17:28:20 +0800
committerDavid Woodhouse <dwmw2@infradead.org>2007-08-09 17:28:20 +0800
commit09b3fba562ce366312b90a6f71d0b727b4d93ba9 (patch)
treebe34f5fe551c0c72a92bff56adcc6d46cddb7fb6 /fs/jffs2
parentRevert "[MTD] Driver for AT26Fxxx dataflash devices" (diff)
downloadlinux-dev-09b3fba562ce366312b90a6f71d0b727b4d93ba9.tar.xz
linux-dev-09b3fba562ce366312b90a6f71d0b727b4d93ba9.zip
[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>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/wbuf.c4
1 files changed, 2 insertions, 2 deletions
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 =
{