Commit 37e38409 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix compilation errors on kernels with no CONFIG_DEBUG_FS 

The Kernel test robot flagged the following warning:

  ".../lpfc_init.c:7788:35: error: 'struct lpfc_sli4_hba' has no member
   named 'c_stat'"

Reviewing this issue highlighted that one of the recent patches caused the
driver to no longer compile cleanly if CONFIG_DEBUG_FS is not set.

Correct the different areas that are failing to compile.

Link: https://lore.kernel.org/r/20210908050927.37275-1-jsmart2021@gmail.com


Fixes: 02243836 ("scsi: lpfc: Add support for the CM framework")
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Build-tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Co-developed-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 59936430

drivers/scsi/lpfc/lpfc_init.c

+2 −2
Original line number Diff line number Diff line
@@ -8277,11 +8277,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) 
	return 0;



out_free_hba_hdwq_info:

	free_percpu(phba->sli4_hba.c_stat);

#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	free_percpu(phba->sli4_hba.c_stat);

out_free_hba_idle_stat:

	kfree(phba->sli4_hba.idle_stat);

#endif

	kfree(phba->sli4_hba.idle_stat);

out_free_hba_eq_info:

	free_percpu(phba->sli4_hba.eq_info);

out_free_hba_cpu_map:

drivers/scsi/lpfc/lpfc_nvme.c

+0 −2
Original line number Diff line number Diff line
@@ -1489,9 +1489,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, 
	struct lpfc_nvme_qhandle *lpfc_queue_info;

	struct lpfc_nvme_fcpreq_priv *freqpriv;

	struct nvme_common_command *sqe;

#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	uint64_t start = 0;

#endif



	/* Validate pointers. LLDD fault handling with transport does

	 * have timing races.

drivers/scsi/lpfc/lpfc_scsi.c

+1 −5
Original line number Diff line number Diff line
@@ -5578,12 +5578,8 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) 
	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));

	int err, idx;

	u8 *uuid = NULL;

#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	uint64_t start = 0L;

	uint64_t start;



	if (phba->ktime_on)

		start = ktime_get_ns();

#endif

	start = ktime_get_ns();

	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);