From 791906467e782b8b3efefbc9edd7513c5b451009 Mon Sep 17 00:00:00 2001 From: Mingguanghai Date: Mon, 20 Oct 2025 20:32:50 +0800 Subject: [PATCH] scsi/hifc: Fix rport dev loss tmo flag and function parameter check err driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC2YMA --------------------------------- 1. hifc driver enable rport dev loss tmo flag, to solve compatibility issues with multiple paths software. 2. unf_logo_ob_callback parameter check bug fix, to solve the problem of resource leakage after the logo times out. Fixes: d346f96ac616 ("scsi/hifc: add FC service module of hifc driver") Signed-off-by: Mingguanghai --- drivers/scsi/huawei/hifc/unf_scsi.c | 2 +- drivers/scsi/huawei/hifc/unf_service.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/huawei/hifc/unf_scsi.c b/drivers/scsi/huawei/hifc/unf_scsi.c index f0f613a51be3..efcac82a3699 100644 --- a/drivers/scsi/huawei/hifc/unf_scsi.c +++ b/drivers/scsi/huawei/hifc/unf_scsi.c @@ -408,7 +408,7 @@ struct fc_function_template function_template = { .show_starget_port_id = 1, .set_rport_dev_loss_tmo = unf_set_rport_loss_tmo, - .show_rport_dev_loss_tmo = 0, + .show_rport_dev_loss_tmo = 1, .issue_fc_host_lip = NULL, .dev_loss_tmo_callbk = unf_dev_loss_timeout_callbk, diff --git a/drivers/scsi/huawei/hifc/unf_service.c b/drivers/scsi/huawei/hifc/unf_service.c index 208954bfbe0b..a202d7111c60 100644 --- a/drivers/scsi/huawei/hifc/unf_service.c +++ b/drivers/scsi/huawei/hifc/unf_service.c @@ -1155,7 +1155,7 @@ static void unf_logo_ob_callback(struct unf_xchg_s *v_xchg) unsigned int nport_id = 0; unsigned int logo_retry = 0; - UNF_CHECK_VALID(0x3675, UNF_TRUE, NULL, return); + UNF_CHECK_VALID(0x3675, UNF_TRUE, v_xchg, return); xchg = v_xchg; old_rport = xchg->rport; logo_retry = old_rport->logo_retries; -- Gitee