Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deb61742 authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

nvmet-fc: fix failing max io queue connections 



fc transport is treating NVMET_NR_QUEUES as maximum queue count, e.g.
admin queue plus NVMET_NR_QUEUES-1 io queues.  But NVMET_NR_QUEUES is
the number of io queues, so maximum queue count is really
NVMET_NR_QUEUES+1.

Fix the handling in the target fc transport

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d9d34c0b

drivers/nvme/target/fc.c

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct nvmet_fc_tgt_assoc { 
	u32				a_id;

	struct nvmet_fc_tgtport		*tgtport;

	struct list_head		a_list;

	struct nvmet_fc_tgt_queue	*queues[NVMET_NR_QUEUES];

	struct nvmet_fc_tgt_queue	*queues[NVMET_NR_QUEUES + 1];

	struct kref			ref;

};
@@ -608,7 +608,7 @@ nvmet_fc_alloc_target_queue(struct nvmet_fc_tgt_assoc *assoc, 
	unsigned long flags;

	int ret;



	if (qid >= NVMET_NR_QUEUES)

	if (qid > NVMET_NR_QUEUES)

		return NULL;



	queue = kzalloc((sizeof(*queue) +
@@ -888,7 +888,7 @@ nvmet_fc_delete_target_assoc(struct nvmet_fc_tgt_assoc *assoc) 
	int i;



	spin_lock_irqsave(&tgtport->lock, flags);

	for (i = NVMET_NR_QUEUES - 1; i >= 0; i--) {

	for (i = NVMET_NR_QUEUES; i >= 0; i--) {

		queue = assoc->queues[i];

		if (queue) {

			if (!nvmet_fc_tgt_q_get(queue))