github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nvme-tcp: don't update queue count when failing to set io queues

Browse Source 
[ Upstream commit 664227fde6 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ruozhu Li 2021-08-07 11:50:23 +08:00 committed by Greg Kroah-Hartman
parent 591f69d7c4
commit 5d0f0c3bbe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvme/host/tcp.c
View File

@ -1755,13 +1755,13 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
if (ret) if (ret)
return ret; return ret;
ctrl->queue_count = nr_io_queues + 1; if (nr_io_queues == 0) {
if (ctrl->queue_count < 2) {
dev_err(ctrl->device, dev_err(ctrl->device,
"unable to set any I/O queues\n"); "unable to set any I/O queues\n");
return -ENOMEM; return -ENOMEM;
} }
ctrl->queue_count = nr_io_queues + 1;
dev_info(ctrl->device, dev_info(ctrl->device,
"creating %d I/O queues.\n", nr_io_queues); "creating %d I/O queues.\n", nr_io_queues);