From: Christoph Hellwig Date: Sat, 4 Apr 2020 06:51:20 +0000 (+0200) Subject: block: fix busy device checking in blk_drop_partitions X-Git-Tag: v5.7-rc1~27^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3ef5536274faf89e626276b833be122a16bdb81;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Jens Axboe --- diff --git a/block/partitions/core.c b/block/partitions/core.c index b79c4513629b6..1a0a829d84169 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)