openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

jffs2: Fix serious write stall due to erase 

Drop the alloc_sem before erasing flash in
jffs2_garbage_collect_pass().
Otherwise writes are put on hold until the erase
has finised.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Joakim Tjernlund 2010-10-07 18:01:44 +02:00 committed by David Woodhouse
parent 733daa52b8
commit 81cfc9f1f4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/jffs2/gc.c
View File

@ -219,13 +219,14 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
if (!list_empty(&c->erase_complete_list) || if (!list_empty(&c->erase_complete_list) ||
!list_empty(&c->erase_pending_list)) { !list_empty(&c->erase_pending_list)) {
spin_unlock(&c->erase_completion_lock); spin_unlock(&c->erase_completion_lock);
mutex_unlock(&c->alloc_sem);
D1(printk(KERN_DEBUG "jffs2_garbage_collect_pass() erasing pending blocks\n")); D1(printk(KERN_DEBUG "jffs2_garbage_collect_pass() erasing pending blocks\n"));
if (jffs2_erase_pending_blocks(c, 1)) { if (jffs2_erase_pending_blocks(c, 1))
mutex_unlock(&c->alloc_sem);
return 0; return 0;
}
D1(printk(KERN_DEBUG "No progress from erasing blocks; doing GC anyway\n")); D1(printk(KERN_DEBUG "No progress from erasing blocks; doing GC anyway\n"));
spin_lock(&c->erase_completion_lock); spin_lock(&c->erase_completion_lock);
mutex_lock(&c->alloc_sem);
} }
/* First, work out which block we're garbage-collecting */ /* First, work out which block we're garbage-collecting */