@@ -245,6 +245,7 @@ static int do_work(struct ubi_device *ubi)
ubi->works_count -= 1;
ubi_assert(ubi->works_count >= 0);
spin_unlock(&ubi->wl_lock);
+ up_read(&ubi->work_sem);
/*
* Call the worker function. Do not touch the work structure
@@ -254,7 +255,6 @@ static int do_work(struct ubi_device *ubi)
err = wrk->func(ubi, wrk, 0);
if (err)
ubi_err("work failed with error code %d", err);
- up_read(&ubi->work_sem);
return err;
}
@@ -1452,7 +1452,7 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
serve_prot_queue(ubi);
/* And take care about wear-leveling */
- err = ensure_wear_leveling(ubi, 1);
+ err = ensure_wear_leveling(ubi, 0);
return err;
}
@@ -1730,13 +1730,14 @@ int ubi_wl_flush(struct ubi_device *ubi, int vol_id, int lnum)
ubi->works_count -= 1;
ubi_assert(ubi->works_count >= 0);
spin_unlock(&ubi->wl_lock);
+ up_read(&ubi->work_sem);
err = wrk->func(ubi, wrk, 0);
if (err) {
- up_read(&ubi->work_sem);
return err;
}
+ down_read(&ubi->work_sem);
spin_lock(&ubi->wl_lock);
found = 1;
break;
There is no need to call the worker function with work_sem held. We only need the semaphore to synchronize workers and protect the work list. Signed-off-by: Richard Weinberger <richard@nod.at> --- drivers/mtd/ubi/wl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)