[PATCH] qla2xxx: fix broken #endif placement

[PATCH] qla2xxx: fix broken #endif placement

[Alexey Dobriyan]

Only half of the file is under include guard because terminating #endif
is placed too early.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 drivers/scsi/qla2xxx/qla_target.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -116,7 +116,6 @@
 	(min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
 		QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
 #endif
-#endif
 
 #define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha))			\
 			 ? le16_to_cpu((iocb)->u.isp2x.target.extended)	\
@@ -244,6 +243,7 @@ struct ctio_to_2xxx {
 #ifndef CTIO_RET_TYPE
 #define CTIO_RET_TYPE	0x17		/* CTIO return entry */
 #define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
+#endif
 
 struct fcp_hdr {
 	uint8_t  r_ctl;

Re: [PATCH] qla2xxx: fix broken #endif placement

[Himanshu Madhani]

> On Mar 14, 2021, at 10:32 AM, Alexey Dobriyan <adobriyan@gmail.com> wrote:
> 
> Only half of the file is under include guard because terminating #endif
> is placed too early.
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> ---
> 
> drivers/scsi/qla2xxx/qla_target.h |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/drivers/scsi/qla2xxx/qla_target.h
> +++ b/drivers/scsi/qla2xxx/qla_target.h
> @@ -116,7 +116,6 @@
> 	(min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
> 		QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
> #endif
> -#endif
> 
> #define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha))			\
> 			 ? le16_to_cpu((iocb)->u.isp2x.target.extended)	\
> @@ -244,6 +243,7 @@ struct ctio_to_2xxx {
> #ifndef CTIO_RET_TYPE
> #define CTIO_RET_TYPE	0x17		/* CTIO return entry */
> #define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
> +#endif
> 
> struct fcp_hdr {
> 	uint8_t  r_ctl;

Looks Good.

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

--
Himanshu Madhani	 Oracle Linux Engineering

Re: [PATCH] qla2xxx: fix broken #endif placement

[Martin K. Petersen]

On Sun, 14 Mar 2021 18:32:46 +0300, Alexey Dobriyan wrote:

> Only half of the file is under include guard because terminating #endif
> is placed too early.

Applied to 5.12/scsi-fixes, thanks!

[1/1] qla2xxx: fix broken #endif placement
      https://git.kernel.org/mkp/scsi/c/5999b9e5b1f8

-- 
Martin K. Petersen	Oracle Linux Engineering