Skip to content

Commit

Permalink
nvme: change nvme_passthru_cmd64 to explicitly mark rsvd
Browse files Browse the repository at this point in the history
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: 65e68ed ("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>
  • Loading branch information
Charles Machalow authored and Keith Busch committed Nov 5, 2019
1 parent 763303a commit 0d6eeb1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions include/uapi/linux/nvme_ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct nvme_passthru_cmd64 {
__u32 cdw14;
__u32 cdw15;
__u32 timeout_ms;
__u32 rsvd2;
__u64 result;
};

Expand Down

0 comments on commit 0d6eeb1

Please sign in to comment.