aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2015-02-27 14:04:27 -0500
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:25 +0100
commit361a387fabc76ca346bbcc88ba9c99ef9e7e4691 (patch)
tree3f5d25129dd58265860fdfa6a01dd82405efcb32 /drivers/md
parent231f9006539c8cee38ec16329dfce18eebb5644e (diff)
downloadkernel_samsung_smdk4412-361a387fabc76ca346bbcc88ba9c99ef9e7e4691.zip
kernel_samsung_smdk4412-361a387fabc76ca346bbcc88ba9c99ef9e7e4691.tar.gz
kernel_samsung_smdk4412-361a387fabc76ca346bbcc88ba9c99ef9e7e4691.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d38d524..c00bcdc 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2295,10 +2295,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,