aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/erase.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-04-23 09:15:24 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2008-04-23 09:15:24 -0400
commite2bc322bf05936ec7160d62bc3fd45cbf4aa405a (patch)
treeea7beb60c2fe6f35df9e6e51895812a9c254ad89 /fs/jffs2/erase.c
parent697fa9721cbc54ce1604dae09d1be6bb918567f6 (diff)
[JFFS2] Add erase_checking_list to hold blocks being marked.
Just to keep the debug code happy when it's adding all the blocks up. Otherwise, they disappear for a while while the locks are dropped to check them and write the cleanmarker. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/erase.c')
-rw-r--r--fs/jffs2/erase.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index 5e2719cb6930..25a640e566d3 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -116,7 +116,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)
116 116
117 if (!list_empty(&c->erase_complete_list)) { 117 if (!list_empty(&c->erase_complete_list)) {
118 jeb = list_entry(c->erase_complete_list.next, struct jffs2_eraseblock, list); 118 jeb = list_entry(c->erase_complete_list.next, struct jffs2_eraseblock, list);
119 list_del(&jeb->list); 119 list_move(&jeb->list, &c->erase_checking_list);
120 spin_unlock(&c->erase_completion_lock); 120 spin_unlock(&c->erase_completion_lock);
121 mutex_unlock(&c->erase_free_sem); 121 mutex_unlock(&c->erase_free_sem);
122 jffs2_mark_erased_block(c, jeb); 122 jffs2_mark_erased_block(c, jeb);
@@ -465,7 +465,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
465 if (c->cleanmarker_size && !jffs2_cleanmarker_oob(c)) 465 if (c->cleanmarker_size && !jffs2_cleanmarker_oob(c))
466 jffs2_link_node_ref(c, jeb, jeb->offset | REF_NORMAL, c->cleanmarker_size, NULL); 466 jffs2_link_node_ref(c, jeb, jeb->offset | REF_NORMAL, c->cleanmarker_size, NULL);
467 467
468 list_add_tail(&jeb->list, &c->free_list); 468 list_move_tail(&jeb->list, &c->free_list);
469 c->nr_erasing_blocks--; 469 c->nr_erasing_blocks--;
470 c->nr_free_blocks++; 470 c->nr_free_blocks++;
471 471
@@ -482,7 +482,7 @@ filebad:
482 spin_lock(&c->erase_completion_lock); 482 spin_lock(&c->erase_completion_lock);
483 /* Stick it on a list (any list) so erase_failed can take it 483 /* Stick it on a list (any list) so erase_failed can take it
484 right off again. Silly, but shouldn't happen often. */ 484 right off again. Silly, but shouldn't happen often. */
485 list_add(&jeb->list, &c->erasing_list); 485 list_move(&jeb->list, &c->erasing_list);
486 spin_unlock(&c->erase_completion_lock); 486 spin_unlock(&c->erase_completion_lock);
487 mutex_unlock(&c->erase_free_sem); 487 mutex_unlock(&c->erase_free_sem);
488 jffs2_erase_failed(c, jeb, bad_offset); 488 jffs2_erase_failed(c, jeb, bad_offset);
@@ -493,7 +493,7 @@ refile:
493 jffs2_erase_pending_trigger(c); 493 jffs2_erase_pending_trigger(c);
494 mutex_lock(&c->erase_free_sem); 494 mutex_lock(&c->erase_free_sem);
495 spin_lock(&c->erase_completion_lock); 495 spin_lock(&c->erase_completion_lock);
496 list_add(&jeb->list, &c->erase_complete_list); 496 list_move(&jeb->list, &c->erase_complete_list);
497 spin_unlock(&c->erase_completion_lock); 497 spin_unlock(&c->erase_completion_lock);
498 mutex_unlock(&c->erase_free_sem); 498 mutex_unlock(&c->erase_free_sem);
499 return; 499 return;