diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
| commit | c29c716662d0cefc0cda4903aea5ed6794174679 (patch) | |
| tree | 01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /drivers/md/dm.c | |
| parent | e63650840e8b053aa09ad934877e87e9941ed135 (diff) | |
| parent | 405c0759712f57b680f66aee9c55cd06ad1cbdef (diff) | |
| download | talos-op-linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.gz talos-op-linux-c29c716662d0cefc0cda4903aea5ed6794174679.zip | |
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 147af9536d0c..ef7bf1dd6900 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1423,8 +1423,6 @@ static void cleanup_mapped_device(struct mapped_device *md) if (md->bs) bioset_free(md->bs); - cleanup_srcu_struct(&md->io_barrier); - if (md->disk) { spin_lock(&_minor_lock); md->disk->private_data = NULL; @@ -1436,6 +1434,8 @@ static void cleanup_mapped_device(struct mapped_device *md) if (md->queue) blk_cleanup_queue(md->queue); + cleanup_srcu_struct(&md->io_barrier); + if (md->bdev) { bdput(md->bdev); md->bdev = NULL; |
