]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
scsi: isci: Avoid -Wflex-array-member-not-at-end warning
authorGustavo A. R. Silva <gustavoars@kernel.org>
Fri, 19 Sep 2025 11:24:30 +0000 (13:24 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 20 Oct 2025 16:00:11 +0000 (12:00 -0400)
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Move the conflicting declaration (which happens to be in a union, so
we're moving the entire union) to the end of the corresponding
structure. Notice that `struct ssp_response_iu` is a flexible structure,
this is a structure that contains a flexible-array member.

With these changes fix the following warning:

drivers/scsi/isci/task.h:92:11: warning: structure containing a flexible
array member is not at the end of another structure
[-Wflex-array-member-not-at-end]

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://patch.msgid.link/aM09bpl1xj9KZSZl@kspp
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/isci/task.h

index f96633fa69395f18c9a1e8cdb37764be1f1271c6..d05d09c1263dc8c2068b3c3b4b3a7510baf8dee4 100644 (file)
@@ -85,15 +85,17 @@ struct isci_tmf {
 
        struct completion *complete;
        enum sas_protocol proto;
+       unsigned char lun[8];
+       u16 io_tag;
+       enum isci_tmf_function_codes tmf_code;
+       int status;
+
+       /* Must be last --ends in a flexible-array member. */
        union {
                struct ssp_response_iu resp_iu;
                struct dev_to_host_fis d2h_fis;
                u8 rsp_buf[SSP_RESP_IU_MAX_SIZE];
        } resp;
-       unsigned char lun[8];
-       u16 io_tag;
-       enum isci_tmf_function_codes tmf_code;
-       int status;
 };
 
 static inline void isci_print_tmf(struct isci_host *ihost, struct isci_tmf *tmf)