--- zzzz-none-000/linux-2.6.19.2/fs/jffs2/nodelist.c 2007-01-10 19:10:37.000000000 +0000 +++ davinci-8020-5505/linux-2.6.19.2/fs/jffs2/nodelist.c 2008-04-10 12:21:44.000000000 +0000 @@ -238,13 +238,14 @@ return no_overlapping_node(c, root, newfrag, this, lastend); } - if (this->node) + if (this->node) { dbg_fragtree2("dealing with frag %u-%u, phys %#08x(%d).\n", this->ofs, this->ofs + this->size, ref_offset(this->node->raw), ref_flags(this->node->raw)); - else + } else { dbg_fragtree2("dealing with hole frag %u-%u.\n", this->ofs, this->ofs + this->size); + } /* OK. 'this' is pointing at the first frag that newfrag->ofs at least partially obsoletes, * - i.e. newfrag->ofs < this->ofs+this->size && newfrag->ofs >= this->ofs @@ -262,12 +263,13 @@ /* The new node splits 'this' frag into two */ struct jffs2_node_frag *newfrag2; - if (this->node) + if (this->node) { dbg_fragtree2("split old frag 0x%04x-0x%04x, phys 0x%08x\n", this->ofs, this->ofs+this->size, ref_offset(this->node->raw)); - else + } else { dbg_fragtree2("split old hole frag 0x%04x-0x%04x\n", this->ofs, this->ofs+this->size); + } /* New second frag pointing to this's node */ newfrag2 = new_fragment(this->node, newfrag->ofs + newfrag->size, @@ -652,8 +654,9 @@ /* Skip all the nodes which are completed before this one starts */ this = jffs2_lookup_node_frag(root, fn_ofs); - if (this) + if (this) { dbg_fragtree2("'this' found %#04x-%#04x (%s)\n", this->ofs, this->ofs + this->size, this->node ? "data" : "hole"); + } if (this) lastend = this->ofs + this->size; @@ -1003,11 +1006,12 @@ /* Exact match not found. Go back up looking at each parent, and return the closest smaller one */ - if (prev) + if (prev) { dbg_fragtree2("no match. Returning frag %#04x-%#04x, closest previous\n", prev->ofs, prev->ofs+prev->size); - else + } else { dbg_fragtree2("returning NULL, empty fragtree\n"); + } return prev; }