Commit 0a39e550 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

null_blk: remove null_gendisk_register 



null_gendisk_register isn't a very useful abstraction given that it
doesn't even allocate the gendisk.  Merge it into the only caller
instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240220093248.3290292-5-hch@lst.de


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

drivers/block/null_blk/main.c

+16 −25
Original line number Diff line number Diff line
@@ -1735,30 +1735,6 @@ static int setup_queues(struct nullb *nullb) 
	return 0;

}



static int null_gendisk_register(struct nullb *nullb)

{

	sector_t size = ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT;

	struct gendisk *disk = nullb->disk;



	set_capacity(disk, size);



	disk->major		= null_major;

	disk->first_minor	= nullb->index;

	disk->minors		= 1;

	disk->fops		= &null_ops;

	disk->private_data	= nullb;

	strscpy_pad(disk->disk_name, nullb->disk_name, DISK_NAME_LEN);



	if (nullb->dev->zoned) {

		int ret = null_register_zoned_dev(nullb);



		if (ret)

			return ret;

	}



	return add_disk(disk);

}



static int null_init_tag_set(struct blk_mq_tag_set *set, int poll_queues)

{

	set->ops = &null_mq_ops;
@@ -1972,7 +1948,22 @@ static int null_add_dev(struct nullb_device *dev) 
		sprintf(nullb->disk_name, "nullb%d", nullb->index);

	}



	rv = null_gendisk_register(nullb);

	set_capacity(nullb->disk,

		((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT);

	nullb->disk->major = null_major;

	nullb->disk->first_minor = nullb->index;

	nullb->disk->minors = 1;

	nullb->disk->fops = &null_ops;

	nullb->disk->private_data = nullb;

	strscpy_pad(nullb->disk->disk_name, nullb->disk_name, DISK_NAME_LEN);



	if (nullb->dev->zoned) {

		rv = null_register_zoned_dev(nullb);

		if (rv)

			goto out_ida_free;

	}



	rv = add_disk(nullb->disk);

	if (rv)

		goto out_ida_free;