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

Commit 9957abea authored by Joakim Tjernlund's avatar Joakim Tjernlund Committed by David Woodhouse
Browse files

jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks() 



We're about to start calling this from the jffs2_garbage_collect_pass(), and
we'll want to know whether it actually did anything or not.

Signed-off-by: default avatarJoakim Tjernlund <joakim.tjernlund@transmode.se>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent cd874237

fs/jffs2/erase.c

+4 −1
Original line number Diff line number Diff line
@@ -103,9 +103,10 @@ static void jffs2_erase_block(struct jffs2_sb_info *c, 
	jffs2_erase_failed(c, jeb, bad_offset);

}



void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)

int jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)

{

	struct jffs2_eraseblock *jeb;

	int work_done = 0;



	mutex_lock(&c->erase_free_sem);
@@ -121,6 +122,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count) 
			mutex_unlock(&c->erase_free_sem);

			jffs2_mark_erased_block(c, jeb);



			work_done++;

			if (!--count) {

				D1(printk(KERN_DEBUG "Count reached. jffs2_erase_pending_blocks leaving\n"));

				goto done;
@@ -157,6 +159,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count) 
	mutex_unlock(&c->erase_free_sem);

 done:

	D1(printk(KERN_DEBUG "jffs2_erase_pending_blocks completed\n"));

	return work_done;

}



static void jffs2_erase_succeeded(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)

fs/jffs2/nodelist.h

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



/* erase.c */

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

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

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



#ifdef CONFIG_JFFS2_FS_WRITEBUFFER