s/jffs2_erase_pending_trigger/jffs2_garbage_collect_trigger/
PATCH 1/1 s/jffs2_erase_pending_trigger/jffs2_garbage_collect_trigger/
Since erasing is done in GC now, trigger GC instead. jffs2_erase_pending_trigger() renamed to jffs2_dirty_trigger() and used by wbuf. Remove call jffs2_garbage_collect_trigger() in write_super()
--- fs/jffs2/erase.c | 4 +--- fs/jffs2/gc.c | 2 +- fs/jffs2/nodemgmt.c | 4 ++-- fs/jffs2/os-linux.h | 2 +- fs/jffs2/scan.c | 2 +- fs/jffs2/super.c | 1 - fs/jffs2/wbuf.c | 8 ++++---- 7 files changed, 10 insertions(+), 13 deletions(-)
fs/jffs2/erase.c +1 -3
@@ -172,8 +172,6 @@ static void jffs2_erase_succeeded(struct jffs2_sb_info *c, struct jffs2_eraseblolist_move_tail (&jeb->list, &c->erase_complete_list);spin_unlock (&c->erase_completion_lock);mutex_unlock (&c->erase_free_sem); -/* Ensure that kupdated calls us again to mark them clean */ -jffs2_erase_pending_trigger (c); }static void jffs2_erase_failed (struct jffs2_sb_info *c,struct jffs2_eraseblock *jeb,uint32_t bad_offset)
@@ -492,7 +490,7 @@ filebad: refile:/* Stick it back on the list from whence it came and come back later */ -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c);mutex_lock (&c->erase_free_sem);spin_lock (&c->erase_completion_lock);list_move (&jeb->list, &c->erase_complete_list);
fs/jffs2/gc.c +1 -1
@@ -435,7 +435,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)list_add_tail (&c->gcblock->list, &c->erase_pending_list); c->gcblock =NULL ; c->nr_erasing_blocks++; -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c); }spin_unlock (&c->erase_completion_lock);
fs/jffs2/nodemgmt.c +2 -2
@@ -218,7 +218,7 @@ static int jffs2_find_nextblock(struct jffs2_sb_info *c) ejeb = list_entry(c->erasable_list.next, struct jffs2_eraseblock, list);list_move_tail (&ejeb->list, &c->erase_pending_list); c->nr_erasing_blocks++; -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c);D1 (printk (KERN_DEBUG "jffs2_find_nextblock: Triggering erase of erasable block at 0x%08x\n" , ejeb->offset)); }
@@ -612,7 +612,7 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_refD1 (printk (KERN_DEBUG "...and adding to erase_pending_list\n" ));list_add_tail (&jeb->list, &c->erase_pending_list); c->nr_erasing_blocks++; -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c); }else {/* Sometimes, however, we leave it elsewhere so it doesn't get immediately reused, and we spread the load a bit. */
fs/jffs2/os-linux.h +1 -1
@@ -141,7 +141,7 @@ void jffs2_nor_wbuf_flash_cleanup(struct jffs2_sb_info *c);#endif /* WRITEBUFFER */ /* erase.c */ -static inline void jffs2_erase_pending_trigger (struct jffs2_sb_info *c) +static inline void jffs2_dirty_trigger (struct jffs2_sb_info *c) {OFNI_BS_2SFFJ (c)->s_dirt =1 ; }
fs/jffs2/scan.c +1 -1
@@ -260,7 +260,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) ret = -EIO ; goto out; } -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c); } ret =0 ; out:
fs/jffs2/super.c +0 -1
@@ -63,7 +63,6 @@ static void jffs2_write_super(struct super_block *sb)if (!(sb->s_flags &MS_RDONLY )) {D1 (printk (KERN_DEBUG "jffs2_write_super()\n" )); -jffs2_garbage_collect_trigger (c);jffs2_flush_wbuf_gc (c,0 ); }
fs/jffs2/wbuf.c +4 -4
@@ -84,7 +84,7 @@ static void jffs2_wbuf_dirties_inode(struct jffs2_sb_info *c, uint32_t ino)struct jffs2_inodirty *new;/* Mark the superblock dirty so that kupdated will flush... */ -jffs2_erase_pending_trigger (c); +jffs2_dirty_trigger (c);if (jffs2_wbuf_pending_for_ino (c, ino))return ;
@@ -121,7 +121,7 @@ static inline void jffs2_refile_wbuf_blocks(struct jffs2_sb_info *c)D1 (printk (KERN_DEBUG "...and adding to erase_pending_list\n" ));list_add_tail (&jeb->list, &c->erase_pending_list); c->nr_erasing_blocks++; -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c); }else {/* Sometimes, however, we leave it elsewhere so it doesn't get immediately reused, and we spread the load a bit. */
@@ -152,7 +152,7 @@ static void jffs2_block_refile(struct jffs2_sb_info *c, struct jffs2_eraseblockD1 (printk ("Refiling block at %08x to erase_pending_list\n" , jeb->offset));list_add (&jeb->list, &c->erase_pending_list); c->nr_erasing_blocks++; -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c); }if (!jffs2_prealloc_raw_node_refs (c, jeb,1 )) {
@@ -543,7 +543,7 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)D1 (printk (KERN_DEBUG "Failing block at %08x is now empty. Moving to erase_pending_list\n" , jeb->offset));list_move (&jeb->list, &c->erase_pending_list); c->nr_erasing_blocks++; -jffs2_erase_pending_trigger (c); +jffs2_garbage_collect_trigger (c); }jffs2_dbg_acct_sanity_check_nolock (c, jeb);
--
1.6.4.4