Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddc58bd6 authored by David Woodhouse's avatar David Woodhouse
Browse files

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



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

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent ba0251fe

fs/jffs2/wbuf.c

+5 −1
Original line number Diff line number Diff line
@@ -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)) {

	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));

		BUG_ON(!frag);

		/* 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);

		return &frag->node->raw;

		break;



	case JFFS2_NODETYPE_DIRENT:

		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();



	default:

		dbg_noderef("Don't care about replacing raw for nodetype %x\n",

			    je16_to_cpu(node->u.nodetype));