Commit b4027ae7 authored by Kamal Mostafa's avatar Kamal Mostafa

[3.13-stable only] Revert "dm: fix AB-BA deadlock in __dm_destroy()"

This reverts commit a1e5fc68 (which is
a botched cherry-pick), to be replaced with a fixed backport.
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 1803fa1e
......@@ -2490,14 +2490,14 @@ static void __dm_destroy(struct mapped_device *md, bool wait)
* do not race with internal suspend.
*/
mutex_lock(&md->suspend_lock);
map = dm_get_live_table(md, &srcu_idx);
if (!dm_suspended_md(md)) {
dm_table_presuspend_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(md, srcu_idx);
mutex_unlock(&md->suspend_lock);
/*
* Rare, but there may be I/O requests still going to complete,
......
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