Commit ab7c7bb6 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer

dm: hold suspend_lock while suspending device during device deletion

__dm_destroy() must take the suspend_lock so that its presuspend and
postsuspend calls do not race with an internal suspend.
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
parent 5f027a3b
...@@ -2638,10 +2638,16 @@ static void __dm_destroy(struct mapped_device *md, bool wait) ...@@ -2638,10 +2638,16 @@ static void __dm_destroy(struct mapped_device *md, bool wait)
if (dm_request_based(md)) if (dm_request_based(md))
flush_kthread_worker(&md->kworker); flush_kthread_worker(&md->kworker);
/*
* Take suspend_lock so that presuspend and postsuspend methods
* do not race with internal suspend.
*/
mutex_lock(&md->suspend_lock);
if (!dm_suspended_md(md)) { if (!dm_suspended_md(md)) {
dm_table_presuspend_targets(map); dm_table_presuspend_targets(map);
dm_table_postsuspend_targets(map); dm_table_postsuspend_targets(map);
} }
mutex_unlock(&md->suspend_lock);
/* dm_put_live_table must be before msleep, otherwise deadlock is possible */ /* dm_put_live_table must be before msleep, otherwise deadlock is possible */
dm_put_live_table(md, srcu_idx); dm_put_live_table(md, srcu_idx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment