From 195cb435c45b69aca5aacaa9351a18f08df1bb7a Mon Sep 17 00:00:00 2001
From: Dan Brown <dan_brown@ieee.org>
Date: Thu, 7 Apr 2005 15:22:58 +0100
Subject: [PATCH] --- yaml --- r: 4542 b: refs/heads/master c:
 abc37e6771ec92bb4c531d218ad572afbef6aa21 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/mtd/nand/diskonchip.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f2c43d054a85..21978c34644c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e4a1d3e6abec5464169a29a3d34473a59e2e8b7
+refs/heads/master: abc37e6771ec92bb4c531d218ad572afbef6aa21
diff --git a/trunk/drivers/mtd/nand/diskonchip.c b/trunk/drivers/mtd/nand/diskonchip.c
index 9f33f335a39d..fdb5d4ad3d52 100644
--- a/trunk/drivers/mtd/nand/diskonchip.c
+++ b/trunk/drivers/mtd/nand/diskonchip.c
@@ -16,7 +16,7 @@
  *  
  * Interface to generic NAND code for M-Systems DiskOnChip devices
  *
- * $Id: diskonchip.c,v 1.53 2005/04/07 13:39:13 dbrown Exp $
+ * $Id: diskonchip.c,v 1.54 2005/04/07 14:22:55 dbrown Exp $
  */
 
 #include <linux/kernel.h>
@@ -1049,6 +1049,16 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
 		
 //u_char mydatabuf[528];
 
+/* The strange out-of-order .oobfree list below is a (possibly unneeded)
+ * attempt to retain compatibility.  It used to read:
+ * 	.oobfree = { {8, 8} }
+ * Since that leaves two bytes unusable, it was changed.  But the following
+ * scheme might affect existing jffs2 installs by moving the cleanmarker:
+ * 	.oobfree = { {6, 10} }
+ * jffs2 seems to handle the above gracefully, but the current scheme seems
+ * safer.  The only problem with it is that any code that parses oobfree must
+ * be able to handle out-of-order segments.
+ */
 static struct nand_oobinfo doc200x_oobinfo = {
         .useecc = MTD_NANDECC_AUTOPLACE,
         .eccbytes = 6,