From db4eff3b44c86636c01855d0831ec217768c98fd Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 8 Jun 2022 08:15:48 +0000 Subject: [PATCH] block: fix busy device checking in blk_drop_partitions mainline inclusion from mainline-v5.7-rc1 commit d3ef5536274faf89e626276b833be122a16bdb81 category: bugfix bugzilla: 186898, https://gitee.com/openeuler/kernel/issues/I5ALFU CVE: NA -------------------------------- 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 Signed-off-by: Li Nan Reviewed-by: Jason Yan Signed-off-by: Yongqiang Liu --- block/partition-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/partition-generic.c b/block/partition-generic.c index c4ac7a8c77dc..9e8a94761b57 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -464,7 +464,7 @@ static int drop_partitions(struct gendisk *disk, struct block_device *bdev) struct hd_struct *part; int res; - 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) -- GitLab