Commit 95838bd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.12-2021-04-23' of git://git.kernel.dk/linux-block 

Pull block fix from Jens Axboe:
 "A single fix for a behavioral regression in this series, when
  re-reading the partition table with partitions open"

* tag 'block-5.12-2021-04-23' of git://git.kernel.dk/linux-block:
  block: return -EBUSY when there are open partitions in blkdev_reread_part
parents 6d1d45cb 68e6582e

block/ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ static int blkdev_reread_part(struct block_device *bdev, fmode_t mode) 
		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;

	if (bdev->bd_part_count)

		return -EBUSY;



	/*

	 * Reopen the device to revalidate the driver state and force a