diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2015-02-27 14:04:27 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 14:14:11 +0200 |
| commit | c83510f1ec1eb63d944fbe4113d72f7c6f2b6fe5 (patch) | |
| tree | 9cb97834db5e636325f4aa4f16b5f9c1e0fb6996 | |
| parent | 52b64c8b06f3d59e54a22aa37aca20f7bf67481a (diff) | |
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 <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 93f3fe443657..5a0b1742f794 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2439,10 +2439,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); |