* [PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled
@ 2017-04-27 19:35 jsmart2021
2017-04-27 19:40 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: jsmart2021 @ 2017-04-27 19:35 UTC (permalink / raw)
To: linux-scsi, linux-nvme, sagi; +Cc: James Smart, Dick Kennedy, James Smart
From: James Smart <jsmart2021@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@broadcom.com>
Signed-off-by: James Smart <james.smart@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
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled
2017-04-27 19:35 [PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled jsmart2021
@ 2017-04-27 19:40 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2017-04-27 19:40 UTC (permalink / raw)
To: jsmart2021, linux-scsi, linux-nvme, sagi; +Cc: Dick Kennedy, James Smart
On 04/27/2017 01:35 PM, jsmart2021@gmail.com wrote:
> From: James Smart <jsmart2021@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@broadcom.com>
> Signed-off-by: James Smart <james.smart@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-27 19:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-27 19:35 [PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled jsmart2021
2017-04-27 19:40 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox