diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2015-02-27 14:04:27 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-16 20:11:45 -0400 |
| commit | 28bd7dd371ff48c382905b39ef04b99472b0baa5 (patch) | |
| tree | e598bffb66e178e58862f99b8d5756f660e4bd11 | |
| parent | b648dce3a954f60df8b3c4069050b842033de1e2 (diff) | |
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 <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/md/dm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index cec85c5bae9e..f743f4714d06 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); |