Commit 74fa8f9c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: pass a queue_limits argument to blk_alloc_disk 



Pass a queue_limits to blk_alloc_disk and apply it if non-NULL.  This
will allow allocating queues with valid queue limits instead of setting
the values one at a time later.

Also change blk_alloc_disk to return an ERR_PTR instead of just NULL
which can't distinguish errors.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Link: https://lore.kernel.org/r/20240215071055.2201424-2-hch@lst.de


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

arch/m68k/emu/nfblock.c

+4 −2
Original line number Diff line number Diff line
@@ -117,9 +117,11 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize) 
	dev->bsize = bsize;

	dev->bshift = ffs(bsize) - 10;



	dev->disk = blk_alloc_disk(NUMA_NO_NODE);

	if (!dev->disk)

	dev->disk = blk_alloc_disk(NULL, NUMA_NO_NODE);

	if (IS_ERR(dev->disk)) {

		err = PTR_ERR(dev->disk);

		goto free_dev;

	}



	dev->disk->major = major_num;

	dev->disk->first_minor = dev_id * 16;

arch/xtensa/platforms/iss/simdisk.c

+5 −3
Original line number Diff line number Diff line
@@ -264,16 +264,18 @@ static int __init simdisk_setup(struct simdisk *dev, int which, 
		struct proc_dir_entry *procdir)

{

	char tmp[2] = { '0' + which, 0 };

	int err = -ENOMEM;

	int err;



	dev->fd = -1;

	dev->filename = NULL;

	spin_lock_init(&dev->lock);

	dev->users = 0;



	dev->gd = blk_alloc_disk(NUMA_NO_NODE);

	if (!dev->gd)

	dev->gd = blk_alloc_disk(NULL, NUMA_NO_NODE);

	if (IS_ERR(dev->gd)) {

		err = PTR_ERR(dev->gd);

		goto out;

	}

	dev->gd->major = simdisk_major;

	dev->gd->first_minor = which;

	dev->gd->minors = SIMDISK_MINORS;

block/genhd.c

+6 −5
Original line number Diff line number Diff line
@@ -1391,20 +1391,21 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id, 
	return NULL;

}



struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)

struct gendisk *__blk_alloc_disk(struct queue_limits *lim, int node,

		struct lock_class_key *lkclass)

{

	struct queue_limits lim = { };

	struct queue_limits default_lim = { };

	struct request_queue *q;

	struct gendisk *disk;



	q = blk_alloc_queue(&lim, node);

	q = blk_alloc_queue(lim ? lim : &default_lim, node);

	if (IS_ERR(q))

		return NULL;

		return ERR_CAST(q);



	disk = __alloc_disk_node(q, node, lkclass);

	if (!disk) {

		blk_put_queue(q);

		return NULL;

		return ERR_PTR(-ENOMEM);

	}

	set_bit(GD_OWNS_QUEUE, &disk->state);

	return disk;

drivers/block/brd.c

+4 −3
Original line number Diff line number Diff line
@@ -335,10 +335,11 @@ static int brd_alloc(int i) 
		debugfs_create_u64(buf, 0444, brd_debugfs_dir,

				&brd->brd_nr_pages);



	disk = brd->brd_disk = blk_alloc_disk(NUMA_NO_NODE);

	if (!disk)

	disk = brd->brd_disk = blk_alloc_disk(NULL, NUMA_NO_NODE);

	if (IS_ERR(disk)) {

		err = PTR_ERR(disk);

		goto out_free_dev;



	}

	disk->major		= RAMDISK_MAJOR;

	disk->first_minor	= i * max_part;

	disk->minors		= max_part;

drivers/block/drbd/drbd_main.c

+4 −2
Original line number Diff line number Diff line
@@ -2708,9 +2708,11 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 


	drbd_init_set_defaults(device);



	disk = blk_alloc_disk(NUMA_NO_NODE);

	if (!disk)

	disk = blk_alloc_disk(NULL, NUMA_NO_NODE);

	if (IS_ERR(disk)) {

		err = PTR_ERR(disk);

		goto out_no_disk;

	}



	device->vdisk = disk;

	device->rq_queue = disk->queue;