Skip to contentSkip to conversation

qla2xxx: fix broken #endif placement

PATCH Applied Alexey Dobriyan 3 participants 3 messages Mar 14, 2021 – Mar 16, 2021

Subsystems (2)
SCSI QLogic QLA2XXX FC-SCSI driver
lore
Share & tools
lore

Alexey Dobriyan

author
#0 lore raw

PATCH 1/1 qla2xxx: fix broken #endif placement

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

Signed-off-by Alexey Dobriyan <[email protected]>

---

 drivers/scsi/qla2xxx/qla_target.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.h +1 -1
@@ -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;
Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Alexey Dobriyan

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

Signed-off-by Alexey Dobriyan <[email protected]>

---

drivers/scsi/qla2xxx/qla_target.h | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.h +0 -1
@@ -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)	\

drivers/scsi/qla2xxx/qla_target.h struct ctio_to_2xxx { · line 249

Quoted 7 lines
drivers/scsi/qla2xxx/qla_target.h +1 -0
@@ -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 <[email protected]>

--
Himanshu Madhani Oracle Linux Engineering