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

pmem: pass queue_limits to blk_mq_alloc_disk 



Pass the queue limits directly to blk_alloc_disk instead of setting them
one at a time.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
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-9-hch@lst.de


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

drivers/nvdimm/pmem.c

+6 −4
Original line number Diff line number Diff line
@@ -451,6 +451,11 @@ static int pmem_attach_disk(struct device *dev, 
{

	struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);

	struct nd_region *nd_region = to_nd_region(dev->parent);

	struct queue_limits lim = {

		.logical_block_size	= pmem_sector_size(ndns),

		.physical_block_size	= PAGE_SIZE,

		.max_hw_sectors		= UINT_MAX,

	};

	int nid = dev_to_node(dev), fua;

	struct resource *res = &nsio->res;

	struct range bb_range;
@@ -497,7 +502,7 @@ static int pmem_attach_disk(struct device *dev, 
		return -EBUSY;

	}



	disk = blk_alloc_disk(NULL, nid);

	disk = blk_alloc_disk(&lim, nid);

	if (IS_ERR(disk))

		return PTR_ERR(disk);

	q = disk->queue;
@@ -539,9 +544,6 @@ static int pmem_attach_disk(struct device *dev, 
	pmem->virt_addr = addr;



	blk_queue_write_cache(q, true, fua);

	blk_queue_physical_block_size(q, PAGE_SIZE);

	blk_queue_logical_block_size(q, pmem_sector_size(ndns));

	blk_queue_max_hw_sectors(q, UINT_MAX);

	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);

	blk_queue_flag_set(QUEUE_FLAG_SYNCHRONOUS, q);

	if (pmem->pfn_flags & PFN_MAP)