aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/erase.c4
-rw-r--r--fs/jffs2/nodelist.h2
-rw-r--r--fs/jffs2/nodemgmt.c2
-rw-r--r--fs/jffs2/summary.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index f939f908b948..aea58ee64d23 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -135,7 +135,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)
135 c->used_size -= jeb->used_size; 135 c->used_size -= jeb->used_size;
136 c->dirty_size -= jeb->dirty_size; 136 c->dirty_size -= jeb->dirty_size;
137 jeb->wasted_size = jeb->used_size = jeb->dirty_size = jeb->free_size = 0; 137 jeb->wasted_size = jeb->used_size = jeb->dirty_size = jeb->free_size = 0;
138 jffs2_free_all_node_refs(c, jeb); 138 jffs2_free_jeb_node_refs(c, jeb);
139 list_add(&jeb->list, &c->erasing_list); 139 list_add(&jeb->list, &c->erasing_list);
140 spin_unlock(&c->erase_completion_lock); 140 spin_unlock(&c->erase_completion_lock);
141 141
@@ -283,7 +283,7 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,
283 jffs2_del_ino_cache(c, ic); 283 jffs2_del_ino_cache(c, ic);
284} 284}
285 285
286void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb) 286void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
287{ 287{
288 struct jffs2_raw_node_ref *ref; 288 struct jffs2_raw_node_ref *ref;
289 D1(printk(KERN_DEBUG "Freeing all node refs for eraseblock offset 0x%08x\n", jeb->offset)); 289 D1(printk(KERN_DEBUG "Freeing all node refs for eraseblock offset 0x%08x\n", jeb->offset));
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h
index 94d152de95eb..21b0b7b6c75f 100644
--- a/fs/jffs2/nodelist.h
+++ b/fs/jffs2/nodelist.h
@@ -417,7 +417,7 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c);
417 417
418/* erase.c */ 418/* erase.c */
419void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count); 419void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count);
420void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb); 420void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
421 421
422#ifdef CONFIG_JFFS2_FS_WRITEBUFFER 422#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
423/* wbuf.c */ 423/* wbuf.c */
diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index 8264eab2c899..bbc873e20807 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -618,7 +618,7 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
618 /* The erase_free_sem is locked, and has been since before we marked the node obsolete 618 /* The erase_free_sem is locked, and has been since before we marked the node obsolete
619 and potentially put its eraseblock onto the erase_pending_list. Thus, we know that 619 and potentially put its eraseblock onto the erase_pending_list. Thus, we know that
620 the block hasn't _already_ been erased, and that 'ref' itself hasn't been freed yet 620 the block hasn't _already_ been erased, and that 'ref' itself hasn't been freed yet
621 by jffs2_free_all_node_refs() in erase.c. Which is nice. */ 621 by jffs2_free_jeb_node_refs() in erase.c. Which is nice. */
622 622
623 D1(printk(KERN_DEBUG "obliterating obsoleted node at 0x%08x\n", ref_offset(ref))); 623 D1(printk(KERN_DEBUG "obliterating obsoleted node at 0x%08x\n", ref_offset(ref)));
624 ret = jffs2_flash_read(c, ref_offset(ref), sizeof(n), &retlen, (char *)&n); 624 ret = jffs2_flash_read(c, ref_offset(ref), sizeof(n), &retlen, (char *)&n);
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index ccb6803a6e41..7bddd33f866a 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -547,7 +547,7 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras
547 jeb->wasted_size = jeb->used_size = jeb->dirty_size = 0; 547 jeb->wasted_size = jeb->used_size = jeb->dirty_size = 0;
548 jeb->free_size = c->sector_size; 548 jeb->free_size = c->sector_size;
549 549
550 jffs2_free_all_node_refs(c, jeb); 550 jffs2_free_jeb_node_refs(c, jeb);
551 return -ENOTRECOVERABLE; 551 return -ENOTRECOVERABLE;
552 } 552 }
553 } 553 }