ioctl: Rearrange members in nvme_sanitize_nvm_args

Avoid any holes in the struct by rearranging the members. Also add the
attribute packed to struct definition to reduce ABI breakage.

struct nvme_sanitize_nvm_args {
        int                        args_size;            /*     0     4 */
        int                        fd;                   /*     4     4 */
        __u32 *                    result;               /*     8     8 */
        __u32                      timeout;              /*    16     4 */
        enum nvme_sanitize_sanact  sanact;               /*    20     4 */
        _Bool                      ause;                 /*    24     1 */
        __u8                       owpass;               /*    25     1 */
        _Bool                      oipbp;                /*    26     1 */
        _Bool                      nodas;                /*    27     1 */
        __u32                      ovrpat;               /*    28     4 */

        /* size: 32, cachelines: 1, members: 6 */
        /* padding: 4 */
        /* last cacheline: 32 bytes */
} __attribute__((__aligned__(8)));

Signed-off-by: Daniel Wagner <[email protected]>

Author: dwsuse

src/nvme/ioctl.h

@@ -3425,27 +3425,27 @@ int nvme_get_property(struct nvme_get_property_args *args);
 /**
  * nvme_sanitize_nvm_args - Arguments for the NVMe Sanitize NVM command
  * @fd:		File descriptor of nvme device
+ * @result:	The command completion result from CQE dword0
+ * @timeout:	Timeout in ms
  * @sanact:	Sanitize action, see &enum nvme_sanitize_sanact
  * @ause:	Set to allow unrestriced sanitize exit
  * @owpass:	Overwrite pass count
  * @oipbp:	Set to overwrite invert pattern between passes
  * @nodas:	Set to not deallocate blocks after sanitizing
  * @ovrpat:	Overwrite pattern
- * @timeout:	Timeout in ms
- * @result:	The command completion result from CQE dword0
  */
 struct nvme_sanitize_nvm_args {
 	int args_size;
 	int fd;
+	__u32 *result;
+	__u32 timeout;
 	enum nvme_sanitize_sanact sanact;
 	bool ause;
 	__u8 owpass;
 	bool oipbp;
 	bool nodas;
 	__u32 ovrpat;
-	__u32 timeout;
-	__u32 *result;
-};
+} __attribute__((packed, aligned(__alignof__(__u32*))));
 
 /**
  * nvme_sanitize_nvm() - Start a sanitize operation
@@ -3477,11 +3477,11 @@ int nvme_sanitize_nvm(struct nvme_sanitize_nvm_args *args);
 struct nvme_dev_self_test_args {
 	int args_size;
 	int fd;
+	__u32 *result;
+	__u32 timeout;
 	__u32 nsid;
 	enum nvme_dst_stc stc;
-	__u32 timeout;
-	__u32 *result;
-};
+} __attribute__((packed, aligned(__alignof__(__u32*))));
 
 /**
  * nvme_dev_self_test() - Start or abort a self test