lkml.org 
[lkml]   [2014]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/3] jffs2: avoid soft-lockup in jffs2_reserve_space_gc()
>> --- a/fs/jffs2/nodemgmt.c
>> +++ b/fs/jffs2/nodemgmt.c
>> @@ -216,15 +216,20 @@ int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,
>>
>> jffs2_dbg(1, "%s(): Requested 0x%x bytes\n", __func__, minsize);
>>
>> - spin_lock(&c->erase_completion_lock);
>> - while(ret == -EAGAIN) {
>> + while (true) {
>> + spin_lock(&c->erase_completion_lock);
>> ret = jffs2_do_reserve_space(c, minsize, len, sumsize);
>> if (ret) {
>> jffs2_dbg(1, "%s(): looping, ret is %d\n",
>> __func__, ret);
>> }
>> + spin_unlock(&c->erase_completion_lock);
>> +
>> + if (ret == -EAGAIN)
>> + cond_resched();
>> + else
>> + break;
>> }
>> - spin_unlock(&c->erase_completion_lock);
>> if (!ret)
>> ret = jffs2_prealloc_raw_node_refs(c, c->nextblock, 1);
>
> Looks OK. We can do this:
>

Yeah, thanks for the cleanup.

> --- a/fs/jffs2/nodemgmt.c~jffs2-avoid-soft-lockup-in-jffs2_reserve_space_gc-fix
> +++ a/fs/jffs2/nodemgmt.c
> @@ -211,7 +211,7 @@ out:
> int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,
> uint32_t *len, uint32_t sumsize)
> {
> - int ret = -EAGAIN;
> + int ret;
> minsize = PAD(minsize);
>
> jffs2_dbg(1, "%s(): Requested 0x%x bytes\n", __func__, minsize);
> _



\
 
 \ /
  Last update: 2014-02-12 03:21    [W:1.283 / U:0.944 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site