|
@@ -43,7 +43,6 @@ struct nvme_fc_queue {
|
|
struct device *dev;
|
|
struct device *dev;
|
|
struct blk_mq_hw_ctx *hctx;
|
|
struct blk_mq_hw_ctx *hctx;
|
|
void *lldd_handle;
|
|
void *lldd_handle;
|
|
- int queue_size;
|
|
|
|
size_t cmnd_capsule_len;
|
|
size_t cmnd_capsule_len;
|
|
u32 qnum;
|
|
u32 qnum;
|
|
u32 rqcnt;
|
|
u32 rqcnt;
|
|
@@ -1886,7 +1885,7 @@ nvme_fc_init_admin_hctx(struct blk_mq_hw_ctx *hctx, void *data,
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
static void
|
|
-nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx, size_t queue_size)
|
|
|
|
|
|
+nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx)
|
|
{
|
|
{
|
|
struct nvme_fc_queue *queue;
|
|
struct nvme_fc_queue *queue;
|
|
|
|
|
|
@@ -1902,8 +1901,6 @@ nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx, size_t queue_size)
|
|
else
|
|
else
|
|
queue->cmnd_capsule_len = sizeof(struct nvme_command);
|
|
queue->cmnd_capsule_len = sizeof(struct nvme_command);
|
|
|
|
|
|
- queue->queue_size = queue_size;
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Considered whether we should allocate buffers for all SQEs
|
|
* Considered whether we should allocate buffers for all SQEs
|
|
* and CQEs and dma map them - mapping their respective entries
|
|
* and CQEs and dma map them - mapping their respective entries
|
|
@@ -2027,7 +2024,7 @@ nvme_fc_init_io_queues(struct nvme_fc_ctrl *ctrl)
|
|
int i;
|
|
int i;
|
|
|
|
|
|
for (i = 1; i < ctrl->ctrl.queue_count; i++)
|
|
for (i = 1; i < ctrl->ctrl.queue_count; i++)
|
|
- nvme_fc_init_queue(ctrl, i, ctrl->ctrl.sqsize);
|
|
|
|
|
|
+ nvme_fc_init_queue(ctrl, i);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
static void
|
|
@@ -2713,7 +2710,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
|
|
* Create the admin queue
|
|
* Create the admin queue
|
|
*/
|
|
*/
|
|
|
|
|
|
- nvme_fc_init_queue(ctrl, 0, NVME_AQ_BLK_MQ_DEPTH);
|
|
|
|
|
|
+ nvme_fc_init_queue(ctrl, 0);
|
|
|
|
|
|
ret = __nvme_fc_create_hw_queue(ctrl, &ctrl->queues[0], 0,
|
|
ret = __nvme_fc_create_hw_queue(ctrl, &ctrl->queues[0], 0,
|
|
NVME_AQ_BLK_MQ_DEPTH);
|
|
NVME_AQ_BLK_MQ_DEPTH);
|