* [PATCH] qla2xxx: fix broken #endif placement
@ 2021-03-14 15:32 Alexey Dobriyan
2021-03-15 19:46 ` Himanshu Madhani
2021-03-16 3:13 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Alexey Dobriyan @ 2021-03-14 15:32 UTC (permalink / raw)
To: jejb, martin.petersen; +Cc: linux-scsi, njavali
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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] qla2xxx: fix broken #endif placement
2021-03-14 15:32 [PATCH] qla2xxx: fix broken #endif placement Alexey Dobriyan
@ 2021-03-15 19:46 ` Himanshu Madhani
2021-03-16 3:13 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Himanshu Madhani @ 2021-03-15 19:46 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: James E.J. Bottomley, Martin Petersen, linux-scsi, njavali
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] qla2xxx: fix broken #endif placement
2021-03-14 15:32 [PATCH] qla2xxx: fix broken #endif placement Alexey Dobriyan
2021-03-15 19:46 ` Himanshu Madhani
@ 2021-03-16 3:13 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2021-03-16 3:13 UTC (permalink / raw)
To: jejb, Alexey Dobriyan; +Cc: Martin K . Petersen, linux-scsi, njavali
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-16 3:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-14 15:32 [PATCH] qla2xxx: fix broken #endif placement Alexey Dobriyan
2021-03-15 19:46 ` Himanshu Madhani
2021-03-16 3:13 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).