diff options
| author | Thomas Gleixner <tglx@cruncher.tec.linutronix.de> | 2006-05-23 12:37:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@cruncher.tec.linutronix.de> | 2006-05-23 12:37:31 +0200 |
| commit | 4cbb9b80e171107c6c34116283fe38e5a396c68b (patch) | |
| tree | 9463f2e4774f14752cf4bb52431e14e569256f72 /fs/jffs2/erase.c | |
| parent | 6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd (diff) | |
| parent | 9fe4854cd1f60273f9a3ece053f4789605f58a5e (diff) | |
| download | kernel_samsung_smdk4412-4cbb9b80e171107c6c34116283fe38e5a396c68b.tar.gz kernel_samsung_smdk4412-4cbb9b80e171107c6c34116283fe38e5a396c68b.tar.bz2 kernel_samsung_smdk4412-4cbb9b80e171107c6c34116283fe38e5a396c68b.zip | |
Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/erase.c')
| -rw-r--r-- | fs/jffs2/erase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index f677d6950fd..4616fed7573 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c @@ -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; } @@ -410,10 +411,9 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb /* Everything else got zeroed before the erase */ jeb->free_size = c->sector_size; - marker_ref->next_in_ino = NULL; marker_ref->flash_offset = jeb->offset | REF_NORMAL; - jffs2_link_node_ref(c, jeb, marker_ref, c->cleanmarker_size); + jffs2_link_node_ref(c, jeb, marker_ref, c->cleanmarker_size, NULL); } spin_lock(&c->erase_completion_lock); |