diff options
| author |   Ruozhu Li <liruozhu@huawei.com> | 2021-08-07 11:50:23 +0800 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2021-08-16 14:42:24 +0200 |
| commit | 664227fde63844d69e9ec9e90a8a7801e6ff072d (patch) | |
| tree | f718e65fad935edb880b86e640fa80d15ce5f97a /drivers/nvme | |
| parent | nvme-tcp: pair send_mutex init with destroy (diff) | |
| download | linux-dev-664227fde63844d69e9ec9e90a8a7801e6ff072d.tar.xz linux-dev-664227fde63844d69e9ec9e90a8a7801e6ff072d.zip | |
nvme-tcp: don't update queue count when failing to set io queues
We update ctrl->queue_count and schedule another reconnect when io queue
count is zero.But we will never try to create any io queue in next reco-
nnection, because ctrl->queue_count already set to zero.We will end up
having an admin-only session in Live state, which is exactly what we try
to avoid in the original patch.
Update ctrl->queue_count after queue_count zero checking to fix it.
Signed-off-by: Ruozhu Li <liruozhu@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 95d4cf777d24..645025620154 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1763,13 +1763,13 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) if (ret) return ret; - ctrl->queue_count = nr_io_queues + 1; - if (ctrl->queue_count < 2) { + if (nr_io_queues == 0) { dev_err(ctrl->device, "unable to set any I/O queues\n"); return -ENOMEM; } + ctrl->queue_count = nr_io_queues + 1; dev_info(ctrl->device, "creating %d I/O queues.\n", nr_io_queues); |