mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
[JFFS2] Improve garbage collector block selection
Make sure the erase_pending_wbuf_list's blocks are taken into account when picking the block to GC. Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
a921e28b4b
commit
a42163d7c3
1 changed files with 7 additions and 1 deletions
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
* For licensing information, see the file 'LICENCE' in this directory.
|
* For licensing information, see the file 'LICENCE' in this directory.
|
||||||
*
|
*
|
||||||
* $Id: gc.c,v 1.145 2005/02/09 09:09:01 pavlov Exp $
|
* $Id: gc.c,v 1.146 2005/03/20 17:45:25 dedekind Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -50,6 +50,7 @@ static struct jffs2_eraseblock *jffs2_find_gc_block(struct jffs2_sb_info *c)
|
||||||
put the clever wear-levelling algorithms. Eventually. */
|
put the clever wear-levelling algorithms. Eventually. */
|
||||||
/* We possibly want to favour the dirtier blocks more when the
|
/* We possibly want to favour the dirtier blocks more when the
|
||||||
number of free blocks is low. */
|
number of free blocks is low. */
|
||||||
|
again:
|
||||||
if (!list_empty(&c->bad_used_list) && c->nr_free_blocks > c->resv_blocks_gcbad) {
|
if (!list_empty(&c->bad_used_list) && c->nr_free_blocks > c->resv_blocks_gcbad) {
|
||||||
D1(printk(KERN_DEBUG "Picking block from bad_used_list to GC next\n"));
|
D1(printk(KERN_DEBUG "Picking block from bad_used_list to GC next\n"));
|
||||||
nextlist = &c->bad_used_list;
|
nextlist = &c->bad_used_list;
|
||||||
|
@ -79,6 +80,11 @@ static struct jffs2_eraseblock *jffs2_find_gc_block(struct jffs2_sb_info *c)
|
||||||
D1(printk(KERN_DEBUG "Picking block from erasable_list to GC next (clean_list and {very_,}dirty_list were empty)\n"));
|
D1(printk(KERN_DEBUG "Picking block from erasable_list to GC next (clean_list and {very_,}dirty_list were empty)\n"));
|
||||||
|
|
||||||
nextlist = &c->erasable_list;
|
nextlist = &c->erasable_list;
|
||||||
|
} else if (!list_empty(&c->erasable_pending_wbuf_list)) {
|
||||||
|
/* There are blocks are wating for the wbuf sync */
|
||||||
|
D1(printk(KERN_DEBUG "Synching wbuf in order to reuse erasable_pending_wbuf_list blocks\n"));
|
||||||
|
jffs2_flush_wbuf_pad(c);
|
||||||
|
goto again;
|
||||||
} else {
|
} else {
|
||||||
/* Eep. All were empty */
|
/* Eep. All were empty */
|
||||||
D1(printk(KERN_NOTICE "jffs2: No clean, dirty _or_ erasable blocks to GC from! Where are they all?\n"));
|
D1(printk(KERN_NOTICE "jffs2: No clean, dirty _or_ erasable blocks to GC from! Where are they all?\n"));
|
||||||
|
|
Loading…
Reference in a new issue