diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2015-02-27 14:04:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-13 14:02:12 +0200 |
| commit | 6b031cd888771b2d162a30b519eb111e6aebb476 (patch) | |
| tree | 3a49f347cda83d74f1e4384355acc89e56aa47f3 | |
| parent | 5e695f0be9dd973e34148fa271fc941c8179ff08 (diff) | |
| download | lwn-6b031cd888771b2d162a30b519eb111e6aebb476.tar.gz lwn-6b031cd888771b2d162a30b519eb111e6aebb476.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 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, |