iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JFFS2] Simplify and clean up jffs2_add_tn_to_tree() some more.

Browse Source 
Fixing at least a couple more bugs in the process.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2007-05-08 00:19:54 +01:00
parent fcf3cafb3e
commit 1c97964520
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/jffs2/readinode.c
View File

@ -240,21 +240,17 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
/* Find the earliest node which _may_ be relevant to this one */ /* Find the earliest node which _may_ be relevant to this one */
this = jffs2_lookup_tn(&rii->tn_root, tn->fn->ofs); this = jffs2_lookup_tn(&rii->tn_root, tn->fn->ofs);
if (!this) { if (this) {
/* First addition to empty tree. $DEITY how I love the easy cases */ /* If the node is coincident with another at a lower address,
rb_link_node(&tn->rb, NULL, &rii->tn_root.rb_node); back up until the other node is found. It may be relevant */
rb_insert_color(&tn->rb, &rii->tn_root); while (this->overlapped)
dbg_readinode("keep new frag\n"); this = tn_prev(this);
return 0;
/* First node should never be marked overlapped */
BUG_ON(!this);
dbg_readinode("'this' found %#04x-%#04x (%s)\n", this->fn->ofs, this->fn->ofs + this->fn->size, this->fn ? "data" : "hole");
} }
/* If the node is coincident with another at a lower address,
back up until the other node is found. It may be relevant */
while (tn->overlapped)
tn = tn_prev(tn);
dbg_readinode("'this' found %#04x-%#04x (%s)\n", this->fn->ofs, this->fn->ofs + this->fn->size, this->fn ? "data" : "hole");
while (this) { while (this) {
if (this->fn->ofs > fn_end) if (this->fn->ofs > fn_end)
break; break;
@ -288,7 +284,7 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
return 0; return 0;
} }
/* ... and is good. Kill 'this' and any subsequent nodes which are also overlapped */ /* ... and is good. Kill 'this' and any subsequent nodes which are also overlapped */
while (this && this->fn->ofs + this->fn->size < fn_end) { while (this && this->fn->ofs + this->fn->size <= fn_end) {
struct jffs2_tmp_dnode_info *next = tn_next(this); struct jffs2_tmp_dnode_info *next = tn_next(this);
if (this->version < tn->version) { if (this->version < tn->version) {
tn_erase(this, &rii->tn_root); tn_erase(this, &rii->tn_root);
@ -300,7 +296,7 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
this = next; this = next;
} }
dbg_readinode("Done killing overlapped nodes\n"); dbg_readinode("Done killing overlapped nodes\n");
break; continue;
} }
if (this->version > tn->version && if (this->version > tn->version &&
this->fn->ofs <= tn->fn->ofs && this->fn->ofs <= tn->fn->ofs &&
@ -326,7 +322,7 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
{ {
struct rb_node *parent; struct rb_node *parent;
struct rb_node **link = &rii->tn_root.rb_node; struct rb_node **link = &rii->tn_root.rb_node;
struct jffs2_tmp_dnode_info *insert_point; struct jffs2_tmp_dnode_info *insert_point = NULL;
while (*link) { while (*link) {
parent = *link; parent = *link;
@ -343,7 +339,6 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
rb_insert_color(&tn->rb, &rii->tn_root); rb_insert_color(&tn->rb, &rii->tn_root);
} }
calc_overlaps:
/* If there's anything behind that overlaps us, note it */ /* If there's anything behind that overlaps us, note it */
this = tn_prev(tn); this = tn_prev(tn);
if (this) { if (this) {