diff options
| author | Hans Holmberg <hans.holmberg@cnexlabs.com> | 2018-03-30 00:04:56 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-03-29 17:29:09 -0600 |
| commit | 7be970b2258654ca48bdf35d532b2eeef038fe91 (patch) | |
| tree | 891fe4b3cb0d52c1e7681410f5b9e40e151b7dc7 /drivers/lightnvm | |
| parent | 5d149bfabeb889b7ee5cd6491bc6d2b5b20c4abd (diff) | |
| download | talos-obmc-linux-7be970b2258654ca48bdf35d532b2eeef038fe91.tar.gz talos-obmc-linux-7be970b2258654ca48bdf35d532b2eeef038fe91.zip | |
lightnvm: pblk: delete writer kick timer before stopping thread
Unless we delete the timer that wakes up the write thread
before we stop the thread we risk re-starting the thread, so
delete the timer first.
Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Reviewed-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/lightnvm')
| -rw-r--r-- | drivers/lightnvm/pblk-init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index 8416910ee8bf..49c65f1dd48b 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -912,9 +912,9 @@ static void pblk_writer_stop(struct pblk *pblk) WARN(pblk_rb_sync_count(&pblk->rwb), "Stopping not fully synced write buffer\n"); + del_timer_sync(&pblk->wtimer); if (pblk->writer_ts) kthread_stop(pblk->writer_ts); - del_timer(&pblk->wtimer); } static void pblk_free(struct pblk *pblk) |
