]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nvme-fc: fix error loop in create_hw_io_queues
authorJames Smart <james.smart@broadcom.com>
Fri, 16 Oct 2020 21:06:04 +0000 (14:06 -0700)
committerChristoph Hellwig <hch@lst.de>
Fri, 23 Oct 2020 10:54:23 +0000 (12:54 +0200)
The loop that backs out of hw io queue creation continues through index
0, which corresponds to the admin queue as well.

Fix the loop so it only proceeds through indexes 1..n which correspond to
I/O queues.

Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/fc.c

index 3e72b7d74df3b6eb93cad84f099aca5a636e9d5b..108130f140d022fe727a8d6bc760e7b2f79e7583 100644 (file)
@@ -2317,7 +2317,7 @@ nvme_fc_create_hw_io_queues(struct nvme_fc_ctrl *ctrl, u16 qsize)
        return 0;
 
 delete_queues:
-       for (; i >= 0; i--)
+       for (; i > 0; i--)
                __nvme_fc_delete_hw_queue(ctrl, &ctrl->queues[i], i);
        return ret;
 }
@@ -2436,7 +2436,7 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg)
                return;
 
        dev_warn(ctrl->ctrl.device,
-               "NVME-FC{%d}: transport association error detected: %s\n",
+               "NVME-FC{%d}: transport association event: %s\n",
                ctrl->cnum, errmsg);
        dev_warn(ctrl->ctrl.device,
                "NVME-FC{%d}: resetting controller\n", ctrl->cnum);