summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-04-04 08:51:20 +0200
committerJens Axboe <axboe@kernel.dk>2020-04-07 14:42:59 -0600
commitd3ef5536274faf89e626276b833be122a16bdb81 (patch)
treeef070be69b23fa83f95a3f0662da2f2b7c6b4b46 /block
parent536167d47ade11a5540b4b1a7125308b1641da7a (diff)
downloadlinux-d3ef5536274faf89e626276b833be122a16bdb81.tar.gz
linux-d3ef5536274faf89e626276b833be122a16bdb81.tar.bz2
linux-d3ef5536274faf89e626276b833be122a16bdb81.zip
block: fix busy device checking in blk_drop_partitions
bd_super is only set by get_tree_bdev and mount_bdev, and thus not by other openers like btrfs or the XFS realtime and log devices, as well as block devices directly opened from user space. Check bd_openers instead. Fixes: 77032ca66f86 ("Return EBUSY from BLKRRPART for mounted whole-dev fs") Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-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 b79c4513629b..1a0a829d8416 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -496,7 +496,7 @@ int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)
if (!disk_part_scan_enabled(disk))
return 0;
- if (bdev->bd_part_count || bdev->bd_super)
+ if (bdev->bd_part_count || bdev->bd_openers)
return -EBUSY;
res = invalidate_partition(disk, 0);
if (res)