V4L/DVB (3971): Cx88-blackbird: use standard filename for cx23416 firmware

[safe/jmp/linux-2.6] / fs / jffs2 / erase.c

diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index 0fc19a2..1862e8b 100644 (file)
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -135,7 +135,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)
                        c->used_size -= jeb->used_size;
                        c->dirty_size -= jeb->dirty_size;
                        jeb->wasted_size = jeb->used_size = jeb->dirty_size = jeb->free_size = 0;
-                       jffs2_free_all_node_refs(c, jeb);
+                       jffs2_free_jeb_node_refs(c, jeb);
                        list_add(&jeb->list, &c->erasing_list);
                        spin_unlock(&c->erase_completion_lock);
 
@@ -230,6 +230,7 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,
                           at the end of the linked list. Stash it and continue
                           from the beginning of the list */
                        ic = (struct jffs2_inode_cache *)(*prev);
+                       BUG_ON(ic->class != RAWNODE_CLASS_INODE_CACHE);
                        prev = &ic->nodes;
                        continue;
                }
@@ -282,22 +283,27 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,
                jffs2_del_ino_cache(c, ic);
 }
 
-void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
+void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
 {
-       struct jffs2_raw_node_ref *ref;
+       struct jffs2_raw_node_ref *block, *ref;
        D1(printk(KERN_DEBUG "Freeing all node refs for eraseblock offset 0x%08x\n", jeb->offset));
-       while(jeb->first_node) {
-               ref = jeb->first_node;
-               jeb->first_node = ref->next_phys;
 
-               /* Remove from the inode-list */
-               if (ref->next_in_ino)
+       block = ref = jeb->first_node;
+
+       while (ref) {
+               if (ref->flash_offset == REF_LINK_NODE) {
+                       ref = ref->next_in_ino;
+                       jffs2_free_refblock(block);
+                       block = ref;
+                       continue;
+               }
+               if (ref->flash_offset != REF_EMPTY_NODE && ref->next_in_ino)
                        jffs2_remove_node_refs_from_ino_list(c, ref, jeb);
                /* else it was a non-inode node or already removed, so don't bother */
 
-               jffs2_free_raw_node_ref(ref);
+               ref++;
        }
-       jeb->last_node = NULL;
+       jeb->first_node = jeb->last_node = NULL;
 }
 
 static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t *bad_offset)
@@ -350,7 +356,6 @@ fail:
 
 static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
 {
-       struct jffs2_raw_node_ref *marker_ref = NULL;
        size_t retlen;
        int ret;
        uint32_t bad_offset;
@@ -383,11 +388,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
                        .totlen =       cpu_to_je32(c->cleanmarker_size)
                };
 
-               marker_ref = jffs2_alloc_raw_node_ref();
-               if (!marker_ref) {
-                       printk(KERN_WARNING "Failed to allocate raw node ref for clean marker. Refiling\n");
-                       goto refile;
-               }
+               jffs2_prealloc_raw_node_refs(c, jeb, 1);
 
                marker.hdr_crc = cpu_to_je32(crc32(0, &marker, sizeof(struct jffs2_unknown_node)-4));
 
@@ -403,16 +404,13 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
                                printk(KERN_WARNING "Short write to newly-erased block at 0x%08x: Wanted %zd, got %zd\n",
                                       jeb->offset, sizeof(marker), retlen);
 
-                       jffs2_free_raw_node_ref(marker_ref);
                        goto filebad;
                }
 
                /* Everything else got zeroed before the erase */
                jeb->free_size = c->sector_size;
-
-               marker_ref->flash_offset = jeb->offset | REF_NORMAL;
-
-               jffs2_link_node_ref(c, jeb, marker_ref, c->cleanmarker_size, NULL);
+               /* FIXME Special case for cleanmarker in empty block */
+               jffs2_link_node_ref(c, jeb, jeb->offset | REF_NORMAL, c->cleanmarker_size, NULL);
        }
 
        spin_lock(&c->erase_completion_lock);