diff options
author | Nikolay Borisov <kernel@kyup.com> | 2015-12-17 11:03:35 -0500 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-12-17 15:47:20 -0500 |
commit | 18d03e8c25f173f4107a40d0b8c24defb6ed69f3 (patch) | |
tree | 6cdaea8c63311344d76035ec82320fd337c71d6f | |
parent | 512167788a6fe9481a33a3cce5f80b684631a1bb (diff) |
dm thin: fix race condition when destroying thin pool workqueue
When a thin pool is being destroyed delayed work items are
cancelled using cancel_delayed_work(), which doesn't guarantee that on
return the delayed item isn't running. This can cause the work item to
requeue itself on an already destroyed workqueue. Fix this by using
cancel_delayed_work_sync() which guarantees that on return the work item
is not running anymore.
Fixes: 905e51b39a555 ("dm thin: commit outstanding data every second")
Fixes: 85ad643b7e7e5 ("dm thin: add timeout to stop out-of-data-space mode holding IO forever")
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/md/dm-thin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index 63903a5a5d9e..a1cc797fe88f 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c | |||
@@ -3453,8 +3453,8 @@ static void pool_postsuspend(struct dm_target *ti) | |||
3453 | struct pool_c *pt = ti->private; | 3453 | struct pool_c *pt = ti->private; |
3454 | struct pool *pool = pt->pool; | 3454 | struct pool *pool = pt->pool; |
3455 | 3455 | ||
3456 | cancel_delayed_work(&pool->waker); | 3456 | cancel_delayed_work_sync(&pool->waker); |
3457 | cancel_delayed_work(&pool->no_space_timeout); | 3457 | cancel_delayed_work_sync(&pool->no_space_timeout); |
3458 | flush_workqueue(pool->wq); | 3458 | flush_workqueue(pool->wq); |
3459 | (void) commit(pool); | 3459 | (void) commit(pool); |
3460 | } | 3460 | } |