Commit a4e1d0b7 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Change the return type of blk_mq_map_queues() into void 



Since blk_mq_map_queues() and the .map_queues() callbacks always return 0,
change their return type into void. Most callers ignore the returned value
anyway.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarMd Haris Iqbal <haris.iqbal@ionos.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20220815170043.19489-3-bvanassche@acm.org


[axboe: fold in fix from Bart]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 10b41ea1

block/blk-mq-cpumap.c

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int get_first_sibling(unsigned int cpu) 
	return cpu;

}



int blk_mq_map_queues(struct blk_mq_queue_map *qmap)

void blk_mq_map_queues(struct blk_mq_queue_map *qmap)

{

	unsigned int *map = qmap->mq_map;

	unsigned int nr_queues = qmap->nr_queues;
@@ -70,8 +70,6 @@ int blk_mq_map_queues(struct blk_mq_queue_map *qmap) 
				map[cpu] = map[first_sibling];

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(blk_mq_map_queues);

block/blk-mq-pci.c

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * that maps a queue to the CPUs that have irq affinity for the corresponding

 * vector.

 */

int blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev,

void blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev,

			   int offset)

{

	const struct cpumask *mask;
@@ -38,11 +38,10 @@ int blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev, 
			qmap->mq_map[cpu] = qmap->queue_offset + queue;

	}



	return 0;

	return;



fallback:

	WARN_ON_ONCE(qmap->nr_queues > 1);

	blk_mq_clear_mq_map(qmap);

	return 0;

}

EXPORT_SYMBOL_GPL(blk_mq_pci_map_queues);

block/blk-mq-rdma.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 * @set->nr_hw_queues, or @dev does not provide an affinity mask for a

 * vector, we fallback to the naive mapping.

 */

int blk_mq_rdma_map_queues(struct blk_mq_queue_map *map,

void blk_mq_rdma_map_queues(struct blk_mq_queue_map *map,

		struct ib_device *dev, int first_vec)

{

	const struct cpumask *mask;
@@ -36,9 +36,9 @@ int blk_mq_rdma_map_queues(struct blk_mq_queue_map *map, 
			map->mq_map[cpu] = map->queue_offset + queue;

	}



	return 0;

	return;



fallback:

	return blk_mq_map_queues(map);

	blk_mq_map_queues(map);

}

EXPORT_SYMBOL_GPL(blk_mq_rdma_map_queues);

block/blk-mq-virtio.c

+4 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 * that maps a queue to the CPUs that have irq affinity for the corresponding

 * vector.

 */

int blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,

void blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,

		struct virtio_device *vdev, int first_vec)

{

	const struct cpumask *mask;
@@ -39,8 +39,9 @@ int blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap, 
			qmap->mq_map[cpu] = qmap->queue_offset + queue;

	}



	return 0;

	return;



fallback:

	return blk_mq_map_queues(qmap);

	blk_mq_map_queues(qmap);

}

EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues);

block/blk-mq.c

+4 −6
Original line number Diff line number Diff line
@@ -4190,7 +4190,7 @@ static int blk_mq_alloc_set_map_and_rqs(struct blk_mq_tag_set *set) 
	return 0;

}



static int blk_mq_update_queue_map(struct blk_mq_tag_set *set)

static void blk_mq_update_queue_map(struct blk_mq_tag_set *set)

{

	/*

	 * blk_mq_map_queues() and multiple .map_queues() implementations
@@ -4220,10 +4220,10 @@ static int blk_mq_update_queue_map(struct blk_mq_tag_set *set) 
		for (i = 0; i < set->nr_maps; i++)

			blk_mq_clear_mq_map(&set->map[i]);



		return set->ops->map_queues(set);

		set->ops->map_queues(set);

	} else {

		BUG_ON(set->nr_maps > 1);

		return blk_mq_map_queues(&set->map[HCTX_TYPE_DEFAULT]);

		blk_mq_map_queues(&set->map[HCTX_TYPE_DEFAULT]);

	}

}
@@ -4322,9 +4322,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) 
		set->map[i].nr_queues = is_kdump_kernel() ? 1 : set->nr_hw_queues;

	}



	ret = blk_mq_update_queue_map(set);

	if (ret)

		goto out_free_mq_map;

	blk_mq_update_queue_map(set);



	ret = blk_mq_alloc_set_map_and_rqs(set);

	if (ret)