Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28bd7dd3 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Sasha Levin
Browse files

dm: hold suspend_lock while suspending device during device deletion 



[ Upstream commit ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24 ]

__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
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent b648dce3

drivers/md/dm.c

+6 −0
Original line number Diff line number Diff line
@@ -2526,10 +2526,16 @@ static void __dm_destroy(struct mapped_device *md, bool wait) 
	set_bit(DMF_FREEING, &md->flags);

	spin_unlock(&_minor_lock);



	/*

	 * 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)) {

		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);