blob: 96567e0046b7fe403d90f2becd5d46465257ff8e [file] [log] [blame]
From 39d3a9acf2161f34b88888a655754bd6f8fbd537 Mon Sep 17 00:00:00 2001
From: Charles Machalow <>
Date: Mon, 4 Nov 2019 22:15:10 -0800
Subject: [PATCH] nvme: change nvme_passthru_cmd64 to explicitly mark rsvd
commit 0d6eeb1fd625272bd60d25f2d5e116cf582fc7dc upstream.
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 <>
Signed-off-by: Keith Busch <>
Signed-off-by: Paul Gortmaker <>
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;