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-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b031cd888771b2d162a30b519eb111e6aebb476;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git dm: hold suspend_lock while suspending device during device deletion commit ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24 upstream. __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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/md/dm.c b/drivers/md/dm.c index a87f0c42cb8b..f69fed826a56 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2333,10 +2333,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); /* * Rare, but there may be I/O requests still going to complete,