diff options
| author | Martin George <marting@netapp.com> | 2020-05-12 18:47:04 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-05-27 07:12:37 +0200 |
| commit | 614fc1c0d980423a131bfb5c93d8d53e5272f587 (patch) | |
| tree | 9ccf1fd73caa795d9fb8b1b09b1074d82fd4a946 /drivers/nvme/host | |
| parent | nvme-pci: make sure write/poll_queues less or equal then cpu count (diff) | |
| download | linux-614fc1c0d980423a131bfb5c93d8d53e5272f587.tar.xz linux-614fc1c0d980423a131bfb5c93d8d53e5272f587.zip | |
nvme-fc: print proper nvme-fc devloss_tmo value
The nvme-fc devloss_tmo is computed as the min of either the
ctrl_loss_tmo (max_retries * reconnect_delay) or the remote port's
devloss_tmo. But what gets printed as the nvme-fc devloss_tmo in
nvme_fc_reconnect_or_delete() is always the remote port's devloss_tmo
value. So correct this by printing the min value instead.
Signed-off-by: Martin George <marting@netapp.com>
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/fc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 0b3ab3355e25..8aabc056c754 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3246,7 +3246,9 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) dev_warn(ctrl->ctrl.device, "NVME-FC{%d}: dev_loss_tmo (%d) expired " "while waiting for remoteport connectivity.\n", - ctrl->cnum, portptr->dev_loss_tmo); + ctrl->cnum, min_t(int, portptr->dev_loss_tmo, + (ctrl->ctrl.opts->max_reconnects * + ctrl->ctrl.opts->reconnect_delay))); WARN_ON(nvme_delete_ctrl(&ctrl->ctrl)); } } |