lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[JFFS2] Fix wbuf recovery of f->metadata->raw node.

Browse Source 
A data node might not be in the fraglist; it could be f->metadata.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse
2006-05-27 13:15:16 +01:00
parent ba0251fe87
commit ddc58bd65e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jffs2/wbuf.c
View File

@@ -190,6 +190,10 @@ static struct jffs2_raw_node_ref **jffs2_incore_replace_raw(struct jffs2_sb_info
switch (je16_to_cpu(node->u.nodetype)) { switch (je16_to_cpu(node->u.nodetype)) {
case JFFS2_NODETYPE_INODE: case JFFS2_NODETYPE_INODE:
if (f->metadata && f->metadata->raw == raw) {
dbg_noderef("Will replace ->raw in f->metadata at %p\n", f->metadata);
return &f->metadata->raw;
}
frag = jffs2_lookup_node_frag(&f->fragtree, je32_to_cpu(node->i.offset)); frag = jffs2_lookup_node_frag(&f->fragtree, je32_to_cpu(node->i.offset));
BUG_ON(!frag); BUG_ON(!frag);
/* Find a frag which refers to the full_dnode we want to modify */ /* Find a frag which refers to the full_dnode we want to modify */
@@ -199,7 +203,6 @@ static struct jffs2_raw_node_ref **jffs2_incore_replace_raw(struct jffs2_sb_info
} }
dbg_noderef("Will replace ->raw in full_dnode at %p\n", frag->node); dbg_noderef("Will replace ->raw in full_dnode at %p\n", frag->node);
return &frag->node->raw; return &frag->node->raw;
break;
case JFFS2_NODETYPE_DIRENT: case JFFS2_NODETYPE_DIRENT:
for (fd = f->dents; fd; fd = fd->next) { for (fd = f->dents; fd; fd = fd->next) {
@@ -209,6 +212,7 @@ static struct jffs2_raw_node_ref **jffs2_incore_replace_raw(struct jffs2_sb_info
} }
} }
BUG(); BUG();
default: default:
dbg_noderef("Don't care about replacing raw for nodetype %x\n", dbg_noderef("Don't care about replacing raw for nodetype %x\n",
je16_to_cpu(node->u.nodetype)); je16_to_cpu(node->u.nodetype));