diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2020-10-02 18:10:33 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-10-02 17:58:52 -0600 |
| commit | f5ace5ef37b1e1de49882248656f35c45e041585 (patch) | |
| tree | 196851df93305c1d8483f09437dd4eb36688bee7 /include/uapi/linux/cdrom.h | |
| parent | 99ba84c5de1e2f5b2b78e9e3bc89e50ec9bc0f29 (diff) | |
block: scsi_ioctl: Avoid the use of one-element arrays
One-element arrays are being deprecated[1]. Replace the one-element array
with a simple object of type compat_caddr_t: 'compat_caddr_t unused'[2],
once it seems this field is actually never used.
Also, update struct cdrom_generic_command in UAPI by adding an
anonimous union to avoid using the one-element array _reserved_.
[1] https://www.kernel.org/doc/html/v5.9-rc1/process/deprecated.html#zero-length-and-one-element-arrays
[2] https://github.com/KSPP/linux/issues/86
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/lkml/5f76f5d0.qJ4t%2FHWuRzSW7bTa%25lkp@intel.com/
Build-tested-by: kernel test robot <lkp@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/uapi/linux/cdrom.h')
| -rw-r--r-- | include/uapi/linux/cdrom.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uapi/linux/cdrom.h b/include/uapi/linux/cdrom.h index 2817230148fd..6c34f6e2f1f7 100644 --- a/include/uapi/linux/cdrom.h +++ b/include/uapi/linux/cdrom.h @@ -289,7 +289,10 @@ struct cdrom_generic_command unsigned char data_direction; int quiet; int timeout; - void __user *reserved[1]; /* unused, actually */ + union { + void __user *reserved[1]; /* unused, actually */ + void __user *unused; + }; }; /* |