Commit a7cbc15a authored by James Smart's avatar James Smart Committed by Li Lingfeng
Browse files

nvme-fc: remove err_work work item

mainline inclusion
from mainline-v5.10-rc2
commit 9c2bb257
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9HJSI
CVE: CVE-2024-26846

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9c2bb2577d81b1a09f7e342e947986e55cad18e3



--------------------------------

err_work was created to handle errors (mainly I/O timeouts) while in
CONNECTING state. The flag for err_work_active is also unneeded.

Remove err_work_active and err_work.  The actions to abort I/Os are moved
inline to nvme_error_recovery().

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>

Conflict:
  drivers/nvme/host/fc.c
[Commit eb4ee8f1 remove assoc_active from nvme_fc_ctrl and change the
type of flags.]
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 48d72040
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment