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

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

[JFFS2] jffs2_free_all_node_refs() doesn't free them all. Rename it. 



... to jffs2_free_jeb_node_refs() since that's what it does.

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

fs/jffs2/erase.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count) 
			c->used_size -= jeb->used_size;

			c->dirty_size -= jeb->dirty_size;

			jeb->wasted_size = jeb->used_size = jeb->dirty_size = jeb->free_size = 0;

			jffs2_free_all_node_refs(c, jeb);

			jffs2_free_jeb_node_refs(c, jeb);

			list_add(&jeb->list, &c->erasing_list);

			spin_unlock(&c->erase_completion_lock);
@@ -283,7 +283,7 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c, 
		jffs2_del_ino_cache(c, ic);

}



void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)

void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)

{

	struct jffs2_raw_node_ref *ref;

	D1(printk(KERN_DEBUG "Freeing all node refs for eraseblock offset 0x%08x\n", jeb->offset));

fs/jffs2/nodelist.h

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c); 


/* erase.c */

void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count);

void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);

void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);



#ifdef CONFIG_JFFS2_FS_WRITEBUFFER

/* wbuf.c */

fs/jffs2/nodemgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref 
	/* The erase_free_sem is locked, and has been since before we marked the node obsolete

	   and potentially put its eraseblock onto the erase_pending_list. Thus, we know that

	   the block hasn't _already_ been erased, and that 'ref' itself hasn't been freed yet

	   by jffs2_free_all_node_refs() in erase.c. Which is nice. */

	   by jffs2_free_jeb_node_refs() in erase.c. Which is nice. */



	D1(printk(KERN_DEBUG "obliterating obsoleted node at 0x%08x\n", ref_offset(ref)));

	ret = jffs2_flash_read(c, ref_offset(ref), sizeof(n), &retlen, (char *)&n);

fs/jffs2/summary.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras 
				jeb->wasted_size = jeb->used_size = jeb->dirty_size = 0;

				jeb->free_size = c->sector_size;



				jffs2_free_all_node_refs(c, jeb);

				jffs2_free_jeb_node_refs(c, jeb);

				return -ENOTRECOVERABLE;

			}

		}