[JFFS2] Fix summary handling of unknown but compatible nodes.

For RWCOMPAT and ROCOMPAT nodes, we should still allow the mount to
succeed. Just abandon the summary and fall through to the full scan.

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

diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index fecf5584f83025ca05f5467e86853be13c1c6324..f677d6950fd40eeea43f70f6bd19a51a2115ddd7 100644 (file)
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -30,7 +30,6 @@ static void jffs2_erase_callback(struct erase_info *);
 #endif
 static void jffs2_erase_failed(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t bad_offset);
 static void jffs2_erase_succeeded(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
-static void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
 static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
 
 static void jffs2_erase_block(struct jffs2_sb_info *c,
@@ -283,7 +282,7 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,
                jffs2_del_ino_cache(c, ic);
 }
 
-static void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
+void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
 {
        struct jffs2_raw_node_ref *ref;
        D1(printk(KERN_DEBUG "Freeing all node refs for eraseblock offset 0x%08x\n", jeb->offset));

diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h
index 1f5d5b0100aa2f097bf8eed160ba80fa19f688a2..194cff7c4853982997767f3d6d27c7243896aa3c 100644 (file)
--- a/fs/jffs2/nodelist.h
+++ b/fs/jffs2/nodelist.h
@@ -436,6 +436,7 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c);
 
 /* erase.c */
 void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count);
+void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
 
 #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
 /* wbuf.c */

diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 53a84b468cfe223a38f669a1e4168d600ecc43ed..9ced3aa958185111ebea61d147322770620a1f0f 100644 (file)
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -554,9 +554,21 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras
                        }
 #endif
                        default : {
-printk("nodetype = %#04x\n",je16_to_cpu(((struct jffs2_sum_unknown_flash *)sp)->nodetype));
-                               JFFS2_WARNING("Unsupported node type found in summary! Exiting...");
-                               return -EIO;
+                               uint16_t nodetype = je16_to_cpu(((struct jffs2_sum_unknown_flash *)sp)->nodetype);
+                               JFFS2_WARNING("Unsupported node type %x found in summary! Exiting...\n", nodetype);
+                               if ((nodetype & JFFS2_COMPAT_MASK) == JFFS2_FEATURE_INCOMPAT)
+                                       return -EIO;
+
+                               /* For compatible node types, just fall back to the full scan */
+                               c->wasted_size -= jeb->wasted_size;
+                               c->free_size += c->sector_size - jeb->free_size;
+                               c->used_size -= jeb->used_size;
+                               c->dirty_size -= jeb->dirty_size;
+                               jeb->wasted_size = jeb->used_size = jeb->dirty_size = 0;
+                               jeb->free_size = c->sector_size;
+
+                               jffs2_free_all_node_refs(c, jeb);
+                               return -ENOTRECOVERABLE;
                        }
                }
        }
@@ -642,8 +654,12 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
        }
 
        ret = jffs2_sum_process_sum_data(c, jeb, summary, pseudo_random);
+       /* -ENOTRECOVERABLE isn't a fatal error -- it means we should do a full
+          scan of this eraseblock. So return zero */
+       if (ret == -ENOTRECOVERABLE)
+               return 0;
        if (ret)
-               return ret;
+               return ret;             /* real error */
 
        /* for PARANOIA_CHECK */
        cache_ref = jffs2_alloc_raw_node_ref();