nvme-fc: eliminate terminate_io use by nvme_fc_error_recovery
authorJames Smart <james.smart@broadcom.com>
Fri, 23 Oct 2020 22:27:51 +0000 (15:27 -0700)
committerChristoph Hellwig <hch@lst.de>
Tue, 27 Oct 2020 09:02:08 +0000 (10:02 +0100)
commit95ced8a2c72dd48167adc4981c3c465c491f2f02
tree4747e6c237c3bd3d2ac4ec6c81d7763f97b0dcea
parent9c2bb2577d81b1a09f7e342e947986e55cad18e3
nvme-fc: eliminate terminate_io use by nvme_fc_error_recovery

nvme_fc_error_recovery() special cases handling when in CONNECTING state
and calls __nvme_fc_terminate_io(). __nvme_fc_terminate_io() itself
special cases CONNECTING state and calls the routine to abort outstanding
ios.

Simplify the sequence by putting the call to abort outstanding I/Os
directly in nvme_fc_error_recovery.

Move the location of __nvme_fc_abort_outstanding_ios(), and
nvme_fc_terminate_exchange() which is called by it, to avoid adding
function prototypes for nvme_fc_error_recovery().

Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/fc.c