Commit 0f77b29a authored by Yu Kuai's avatar Yu Kuai Committed by Jens Axboe
Browse files

block: Revert "block: Do not reread partition table on exclusively open device" 



This reverts commit 36369f46.

This patch can't fix the problem in a corner case that device can be
opened exclusively after the checking and before blkdev_get_by_dev().
We'll use a new solution to fix the problem in the next patch, and
the new solution doesn't need to change apis.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Acked-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230217022200.3092987-2-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9ec041ea

block/blk.h

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio, 


struct request_queue *blk_alloc_queue(int node_id);



int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner);

int disk_scan_partitions(struct gendisk *disk, fmode_t mode);



int disk_alloc_events(struct gendisk *disk);

void disk_add_events(struct gendisk *disk);

block/genhd.c

+2 −5
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action) 
}

EXPORT_SYMBOL_GPL(disk_uevent);



int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner)

int disk_scan_partitions(struct gendisk *disk, fmode_t mode)

{

	struct block_device *bdev;
@@ -366,9 +366,6 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner) 
		return -EINVAL;

	if (disk->open_partitions)

		return -EBUSY;

	/* Someone else has bdev exclusively open? */

	if (disk->part0->bd_holder && disk->part0->bd_holder != owner)

		return -EBUSY;



	set_bit(GD_NEED_PART_SCAN, &disk->state);

	bdev = blkdev_get_by_dev(disk_devt(disk), mode, NULL);
@@ -499,7 +496,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 


		bdev_add(disk->part0, ddev->devt);

		if (get_capacity(disk))

			disk_scan_partitions(disk, FMODE_READ, NULL);

			disk_scan_partitions(disk, FMODE_READ);



		/*

		 * Announce the disk and partitions after all partitions are

block/ioctl.c

+6 −7
Original line number Diff line number Diff line
@@ -467,10 +467,10 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode, 
 * user space. Note the separate arg/argp parameters that are needed

 * to deal with the compat_ptr() conversion.

 */

static int blkdev_common_ioctl(struct file *file, fmode_t mode, unsigned cmd,

			       unsigned long arg, void __user *argp)

static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,

			       unsigned int cmd, unsigned long arg,

			       void __user *argp)

{

	struct block_device *bdev = I_BDEV(file->f_mapping->host);

	unsigned int max_sectors;



	switch (cmd) {
@@ -528,8 +528,7 @@ static int blkdev_common_ioctl(struct file *file, fmode_t mode, unsigned cmd, 
			return -EACCES;

		if (bdev_is_partition(bdev))

			return -EINVAL;

		return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL,

					    file);

		return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL);

	case BLKTRACESTART:

	case BLKTRACESTOP:

	case BLKTRACETEARDOWN:
@@ -607,7 +606,7 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
		break;

	}



	ret = blkdev_common_ioctl(file, mode, cmd, arg, argp);

	ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp);

	if (ret != -ENOIOCTLCMD)

		return ret;
@@ -676,7 +675,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
		break;

	}



	ret = blkdev_common_ioctl(file, mode, cmd, arg, argp);

	ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp);

	if (ret == -ENOIOCTLCMD && disk->fops->compat_ioctl)

		ret = disk->fops->compat_ioctl(bdev, mode, cmd, arg);