After reviewing the error_recovery paths to address the abort on the io to cover timeouts on connecting ios, it became clear that some of the thing in the way it was coded were unnecessary. This patch set cleans up those items and refactors. It then addresses the failure case of io errors during reconnect which wants to take the create failure cases, but there is no status back from the core routines to trigger that path. Note: this assumes the patch "nvme_fc: track error_recovery while connecting" has been applied already V2: Extracted v1's patch4 (the track error_recovery patch) into it's own patch as it is a fix, not a cleanup. That patch was posted on its own. James Smart (3): nvme-fc: remove err_work work item nvme-fc: eliminate terminate_io use by nvme_fc_error_recovery nvme-fc: remove nvme_fc_terminate_io() drivers/nvme/host/fc.c | 258 ++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 157 deletions(-) -- 2.26.2