From: Mikulas Patocka Date: Fri, 27 Feb 2015 19:04:27 +0000 (-0500) Subject: dm: hold suspend_lock while suspending device during device deletion X-Git-Tag: v3.18.12~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28bd7dd371ff48c382905b39ef04b99472b0baa5;p=thirdparty%2Fkernel%2Fstable.git 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: Mikulas Patocka Signed-off-by: Mike Snitzer Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- diff --git a/drivers/md/dm.c b/drivers/md/dm.c index cec85c5bae9e9..f743f4714d066 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -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);