Merge tag 'block5.9-2020-10-08' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index ef722f04f88a93b38d2c3df4f503dea5da05ffbd..72108404718fe717a249584fdbd32b676cc310c8 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -651,6 +651,7 @@ struct compat_cdrom_generic_command {
        compat_int_t    stat;
        compat_caddr_t  sense;
        unsigned char   data_direction;
+       unsigned char   pad[3];
        compat_int_t    quiet;
        compat_int_t    timeout;
        compat_caddr_t  reserved[1];