Commit 9f18db57 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: don't set GENHD_FL_NO_PART for hidden gendisks 



Hidden gendisks can't be opened using blkdev_get_*, so we can't really
reach any of the partition scanning paths or partitioning ioctls except
for the initial partition scan from add_disk.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211122130625.1136848-13-hch@lst.de


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

block/genhd.c

+2 −7
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode) 
{

	struct block_device *bdev;



	if (disk->flags & GENHD_FL_NO_PART)

	if (disk->flags & (GENHD_FL_NO_PART | GENHD_FL_HIDDEN))

		return -EINVAL;

	if (disk->open_partitions)

		return -EBUSY;
@@ -493,12 +493,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 
	if (ret)

		goto out_put_slave_dir;



	if (disk->flags & GENHD_FL_HIDDEN) {

		/*

		 * Don't bother scanning for partitions.

		 */

		disk->flags |= GENHD_FL_NO_PART;

	} else {

	if (!(disk->flags & GENHD_FL_HIDDEN)) {

		ret = bdi_register(disk->bdi, "%u:%u",

				   disk->major, disk->first_minor);

		if (ret)