Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

nvme: change nvme_passthru_cmd64 to explicitly mark rsvd

Changing nvme_passthru_cmd64 to add a field: rsvd2. This field is an explicit
marker for the padding space added on certain platforms as a result of the
enlargement of the result field from 32 bit to 64 bits in size, and
fixes differences in struct size when using compat ioctl for 32-bit
binaries on 64-bit architecture.

Fixes: 65e68edce0db ("nvme: allow 64-bit results in passthru commands")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Charles Machalow <csm10495@gmail.com>
[changelog]
Signed-off-by: Keith Busch <kbusch@kernel.org>

authored by

Charles Machalow and committed by
Keith Busch
0d6eeb1f 763303a8

+1
+1
include/uapi/linux/nvme_ioctl.h
··· 63 63 __u32 cdw14; 64 64 __u32 cdw15; 65 65 __u32 timeout_ms; 66 + __u32 rsvd2; 66 67 __u64 result; 67 68 }; 68 69