Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a202268 authored by James Smart's avatar James Smart Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: Correct localport timeout duration error 



[ Upstream commit 2a0fb340fcc816975b8b0f2fef913d11999c39cf ]

Current code incorrectly specifies a completion wait timeout duration in 5
jiffies, when it should have been 5 seconds.

Fix the adjust for units for the completion timeout call.

[mkp: manual merge]

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1df87fc5

drivers/scsi/lpfc/lpfc_nvmet.c

+5 −1
Original line number Diff line number Diff line
@@ -1713,7 +1713,11 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba) 
		}

		tgtp->tport_unreg_cmp = &tport_unreg_cmp;

		nvmet_fc_unregister_targetport(phba->targetport);

		wait_for_completion_timeout(&tport_unreg_cmp, 5);

		if (!wait_for_completion_timeout(tgtp->tport_unreg_cmp,

					msecs_to_jiffies(LPFC_NVMET_WAIT_TMO)))

			lpfc_printf_log(phba, KERN_ERR, LOG_NVME,

					"6179 Unreg targetport %p timeout "

					"reached.\n", phba->targetport);

		lpfc_nvmet_cleanup_io_context(phba);

	}

	phba->targetport = NULL;

drivers/scsi/lpfc/lpfc_nvmet.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#define LPFC_NVMET_MRQ_AUTO		0

#define LPFC_NVMET_MRQ_MAX		16



#define LPFC_NVMET_WAIT_TMO		(5 * MSEC_PER_SEC)



/* Used for NVME Target */

struct lpfc_nvmet_tgtport {

	struct lpfc_hba *phba;