Commit fb8745d0 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-tcp: remove the unused queue_size member in nvme_tcp_queue 



->nvme_tcp_queue is not used anywhere, so remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
parent fe60e8c5

drivers/nvme/host/tcp.c

+3 −6
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ struct nvme_tcp_queue { 
	/* send state */

	struct nvme_tcp_request *request;



	int			queue_size;

	u32			maxh2cdata;

	size_t			cmnd_capsule_len;

	struct nvme_tcp_ctrl	*ctrl;
@@ -1479,8 +1478,7 @@ static void nvme_tcp_set_queue_io_cpu(struct nvme_tcp_queue *queue) 
	queue->io_cpu = cpumask_next_wrap(n - 1, cpu_online_mask, -1, false);

}



static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,

		int qid, size_t queue_size)

static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid)

{

	struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl);

	struct nvme_tcp_queue *queue = &ctrl->queues[qid];
@@ -1492,7 +1490,6 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, 
	INIT_LIST_HEAD(&queue->send_list);

	mutex_init(&queue->send_mutex);

	INIT_WORK(&queue->io_work, nvme_tcp_io_work);

	queue->queue_size = queue_size;



	if (qid > 0)

		queue->cmnd_capsule_len = nctrl->ioccsz * 16;
@@ -1785,7 +1782,7 @@ static int nvme_tcp_alloc_admin_queue(struct nvme_ctrl *ctrl) 
{

	int ret;



	ret = nvme_tcp_alloc_queue(ctrl, 0, NVME_AQ_DEPTH);

	ret = nvme_tcp_alloc_queue(ctrl, 0);

	if (ret)

		return ret;
@@ -1805,7 +1802,7 @@ static int __nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) 
	int i, ret;



	for (i = 1; i < ctrl->queue_count; i++) {

		ret = nvme_tcp_alloc_queue(ctrl, i, ctrl->sqsize + 1);

		ret = nvme_tcp_alloc_queue(ctrl, i);

		if (ret)

			goto out_free_queues;

	}