let JFFS2 work without OOB

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c2dc1f0de79c1b73cc8b4fec34b8d650a069b971..aedabe0d853282062bba6c2b3b4bae194c186b45 100644 (file)
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -1784,6 +1784,9 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        else
                len = mtd->oobsize;
 
+       if (len == 0)
+               return 0;
+
        if (unlikely(ops->ooboffs >= len)) {
                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to start read "
                                        "outside oob\n", __func__);
@@ -2383,6 +2386,9 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
        else
                len = mtd->oobsize;
 
+       if (len == 0)
+               return 0;
+
        /* Do not allow write past end of page */
        if ((ops->ooboffs + ops->ooblen) > len) {
                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to write "

diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 4515bea0268fa6ac17f8b2d61bd818bea42b6674..df6628469347c5394a090c069a18866ac5b4cec6 100644 (file)
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -1153,7 +1153,7 @@ int jffs2_nand_flash_setup(struct jffs2_sb_info *c)
        /* Cleanmarker is out-of-band, so inline size zero */
        c->cleanmarker_size = 0;
 
-       if (!oinfo || oinfo->oobavail == 0) {
+       if (!oinfo /* || oinfo->oobavail == 0 */) {
                printk(KERN_ERR "inconsistent device description\n");
                return -EINVAL;
        }