diff options
authorCharles Machalow <>2019-11-04 22:15:10 -0800
committerKeith Busch <>2019-11-06 06:17:38 +0900
commit0d6eeb1fd625272bd60d25f2d5e116cf582fc7dc (patch)
parent763303a83a095a88c3a8a0d1abf97165db2e8bf5 (diff)
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 <> Signed-off-by: Charles Machalow <> [changelog] Signed-off-by: Keith Busch <>
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/nvme_ioctl.h b/include/uapi/linux/nvme_ioctl.h
index e168dc59e9a0..d99b5a772698 100644
--- a/include/uapi/linux/nvme_ioctl.h
+++ b/include/uapi/linux/nvme_ioctl.h
@@ -63,6 +63,7 @@ struct nvme_passthru_cmd64 {
__u32 cdw14;
__u32 cdw15;
__u32 timeout_ms;
+ __u32 rsvd2;
__u64 result;