summaryrefslogtreecommitdiffstats
path: root/block/partitions
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-05-09 16:13:58 -0600
committerJens Axboe <axboe@kernel.dk>2020-05-09 16:13:58 -0600
commit873f1c8df7e0dac2156a722f3c7848a30693a242 (patch)
tree629e95d72af5be4cfd843e2c369b59c3de5baae6 /block/partitions
parent8b075e5ba459c7afdd7b2fde14cbc01c51e25eac (diff)
parent59c7c3caaaf8750df4ec3255082f15eb4e371514 (diff)
downloadlinux-873f1c8df7e0dac2156a722f3c7848a30693a242.tar.gz
linux-873f1c8df7e0dac2156a722f3c7848a30693a242.tar.bz2
linux-873f1c8df7e0dac2156a722f3c7848a30693a242.zip
Merge branch 'block-5.7' into for-5.8/block
Pull in block-5.7 fixes for 5.8. Mostly to resolve a conflict with the blk-iocost changes, but we also need the base of the bdi use-after-free as well as we build on top of it. * block-5.7: nvme: fix possible hang when ns scanning fails during error recovery nvme-pci: fix "slimmer CQ head update" bdi: add a ->dev_name field to struct backing_dev_info bdi: use bdi_dev_name() to get device name bdi: move bdi_dev_name out of line vboxsf: don't use the source name in the bdi name iocost: protect iocg->abs_vdebt with iocg->waitq.lock block: remove the bd_openers checks in blk_drop_partitions nvme: prevent double free in nvme_alloc_ns() error handling null_blk: Cleanup zoned device initialization null_blk: Fix zoned command handling block: remove unused header blk-iocost: Fix error on iocost_ioc_vrate_adj bdev: Reduce time holding bd_mutex in sync in blkdev_close() buffer: remove useless comment and WB_REASON_FREE_MORE_MEM, reason. Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/partitions')
-rw-r--r--block/partitions/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/partitions/core.c b/block/partitions/core.c
index c085bf85509b..873999e2e2f2 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -610,7 +610,7 @@ int blk_drop_partitions(struct block_device *bdev)
if (!disk_part_scan_enabled(bdev->bd_disk))
return 0;
- if (bdev->bd_part_count || bdev->bd_openers > 1)
+ if (bdev->bd_part_count)
return -EBUSY;
sync_blockdev(bdev);