Replace one-element array with DECLARE_FLEX_ARRAY() helper
Subsystems (2)
PATCH RESEND 1/1 Replace one-element array with DECLARE_FLEX_ARRAY() helper
One-element arrays as fake flex arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace one-element array declaration in struct ct_sns_gpnft_rsp, which is ultimately being used inside a union:
drivers/scsi/qla2xxx/qla_def.h:
3240 struct ct_sns_gpnft_pkt {
3241 union {
3242 struct ct_sns_req req;
3243 struct ct_sns_gpnft_rsp rsp;
3244 } p;
3245 };
Refactor the rest of the code, accordingly.
This issue was found with the help of Coccinelle.
--- drivers/scsi/qla2xxx/qla_def.h | 4 ++-- drivers/scsi/qla2xxx/qla_gs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +2 -2
@@ -3174,12 +3174,12 @@ struct ct_sns_gpnft_rsp {uint8_t vendor_unique; };/* Assume the largest number of targets for the union */ -struct ct_sns_gpn_ft_data { +DECLARE_FLEX_ARRAY (struct ct_sns_gpn_ft_data {u8 control_byte;u8 port_id[3 ];u32 reserved;u8 port_name[8 ]; - } entries[1 ]; + }, entries); };/* CT command response */
drivers/scsi/qla2xxx/qla_gs.c +2 -2
@@ -3776,8 +3776,8 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp) sp->u.iocb_cmd.u.ctarg.req_size =GPN_FT_REQ_SIZE ; rspsz =sizeof (struct ct_sns_gpnft_rsp ) + - ((vha->hw->max_fibre_devices -1 ) * -sizeof (struct ct_sns_gpn_ft_data )); + vha->hw->max_fibre_devices * +sizeof (struct ct_sns_gpn_ft_data ); sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev, rspsz,
Signature · 1 line
2.34.1
Martin K. Petersen
AppliedGustavo,
Quoted 4 lines
One-element arrays as fake flex arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace one-element array declaration in struct
ct_sns_gpnft_rsp, which is ultimately being used inside a union:
Applied to 6.5/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 13 lines · Gustavo A. R. Silva
One-element arrays as fake flex arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace one-element array declaration in struct
ct_sns_gpnft_rsp, which is ultimately being used inside a union:
drivers/scsi/qla2xxx/qla_def.h:
3240 structct_sns_gpnft_pkt{
3241 union {
3242 structct_sns_reqreq;
3243 structct_sns_gpnft_rsprsp;
3244 } p;
3245 };
Quoted 1 line
[...]
Applied to 6.5/scsi-queue, thanks!
[1/1] Replace one-element array with DECLARE_FLEX_ARRAY() helper
https://git.kernel.org/mkp/scsi/c/512a365368c7
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering