diff options
| author | Mikulas Patocka | 2015-02-27 20:04:27 +0100 |
|---|---|---|
| committer | Mike Snitzer | 2015-02-27 20:09:23 +0100 |
| commit | ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24 (patch) | |
| tree | 5ce6a44f6f2e4ba727bb138bfd85f3af7b137740 /drivers/md/dm.c | |
| parent | dm thin: fix to consistently zero-fill reads to unprovisioned blocks (diff) | |
| download | kernel-qcow2-linux-ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24.tar.gz kernel-qcow2-linux-ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24.tar.xz kernel-qcow2-linux-ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24.zip | |
dm: hold suspend_lock while suspending device during device deletion
__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
Diffstat (limited to 'drivers/md/dm.c')
| -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 73f28802dc7a..e79d5ccfda64 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2638,10 +2638,16 @@ static void __dm_destroy(struct mapped_device *md, bool wait) if (dm_request_based(md)) flush_kthread_worker(&md->kworker); + /* + * 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); |