[PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled

Jens Axboe axboe at kernel.dk
Thu Apr 27 12:40:05 PDT 2017


On 04/27/2017 01:35 PM, jsmart2021 at gmail.com wrote:
> From: James Smart <jsmart2021 at gmail.com>
> 
> fix compile error when CONFIG_NVME_TARGET_FC not enabled
> 
> return statement needs to be outside of ifdef
> 
> Signed-off-by: Dick Kennedy <dick.kennedy at broadcom.com>
> Signed-off-by: James Smart <james.smart at broadcom.com>
> ---
> Patch to be pulled in via block trees
> 
> Patch cut against nvme-4.12 tree
> 
> 
>  drivers/scsi/lpfc/lpfc_nvmet.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
> index 90527e7..4da99db 100644
> --- a/drivers/scsi/lpfc/lpfc_nvmet.c
> +++ b/drivers/scsi/lpfc/lpfc_nvmet.c
> @@ -958,8 +958,8 @@ lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport,
>  
>  	/* Respond with BA_RJT accordingly */
>  	lpfc_sli4_seq_abort_rsp(vport, fc_hdr, 0);
> -	return 0;
>  #endif
> +	return 0;
>  }
>  
>  void
> 

I fixed this up already when I merged it, it's in the merge commit with
the block for-4.12/post-merge tree.

-- 
Jens Axboe




More information about the Linux-nvme mailing list