evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Joakim Tjernlund 2010-05-19 16:32:52 +01:00 • committed by David Woodhouse
parent cd874237d9
commit 9957abea31
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/jffs2/erase.c
View file

@ -103,9 +103,10 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,
jffs2_erase_failed(c, jeb, bad_offset); 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; struct jffs2_eraseblock *jeb;
int work_done = 0;
mutex_lock(&c->erase_free_sem); 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); mutex_unlock(&c->erase_free_sem);
jffs2_mark_erased_block(c, jeb); jffs2_mark_erased_block(c, jeb);
work_done++;
if (!--count) { if (!--count) {
D1(printk(KERN_DEBUG "Count reached. jffs2_erase_pending_blocks leaving\n")); D1(printk(KERN_DEBUG "Count reached. jffs2_erase_pending_blocks leaving\n"));
goto done; goto done;
@ -157,6 +159,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)
mutex_unlock(&c->erase_free_sem); mutex_unlock(&c->erase_free_sem);
done: done:
D1(printk(KERN_DEBUG "jffs2_erase_pending_blocks completed\n")); 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) static void jffs2_erase_succeeded(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)

2
fs/jffs2/nodelist.h
View file

@ -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); int jffs2_do_mount_fs(struct jffs2_sb_info *c);
/* erase.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); void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
#ifdef CONFIG_JFFS2_FS_WRITEBUFFER #ifdef CONFIG_JFFS2_FS_WRITEBUFFER