Use argument structure for nvme_capacity_mgmt()

Use an argument structure instead of passing all arguments one by one.
This allows for a future expansion of the argument list without having
to change the library ABI.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

src/nvme/ioctl.c

@@ -1381,21 +1381,21 @@ int nvme_directive_recv(struct nvme_directive_recv_args *args)
 	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
-int nvme_capacity_mgmt(int fd, __u8 op, __u16 element_id,
-		       __u32 dw11, __u32 dw12,
-		       __u32 timeout, __u32 *result)
+int nvme_capacity_mgmt(struct nvme_capacity_mgmt_args *args)
 {
-	__u32 dw10 = op | element_id << 16;
+	__u32 cdw10 = args->op | args->element_id << 16;
 
         struct nvme_passthru_cmd cmd = {
 		.opcode		= nvme_admin_capacity_mgmt,
-		.cdw10		= dw10,
-		.cdw11		= dw11,
-		.cdw12		= dw12,
-		.timeout_ms	= timeout,
+		.cdw10		= cdw10,
+		.cdw11		= args->cdw11,
+		.cdw12		= args->cdw12,
+		.timeout_ms	= args->timeout,
 	};
 
-	return nvme_submit_admin_passthru(fd, &cmd, result);
+	if (args->args_size < sizeof(*args))
+		return -EINVAL;
+	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
 int nvme_lockdown(int fd, __u8 scp, __u8 prhbt, __u8 ifc, __u8 ofi,

src/nvme/ioctl.h

@@ -3327,13 +3327,26 @@ static inline int nvme_directive_recv_stream_allocate(int fd, __u32 nsid,
  *		Endurance Group or NVM Set to be created
  * @timeout:	Timeout in ms
  * @result:	If successful, the CQE dword0 value
+ */
+struct nvme_capacity_mgmt_args {
+	int args_size;
+	int fd;
+	__u8 op;
+	__u16 element_id;
+	__u32 cdw11;
+	__u32 cdw12;
+	__u32 timeout;
+	__u32 *result;
+};
+
+/**
+ * nvme_capacity_mgmt() -
+ * @args:	&struct nvme_capacity_mgmt_args argument structure
  *
  * Return: The nvme command status if a response was received (see
  * &enum nvme_status_field) or -1 with errno set otherwise.
  */
-int nvme_capacity_mgmt(int fd, __u8 op, __u16 element_id,
-		       __u32 dw11, __u32 dw12,
-		       __u32 timeout, __u32 *result);
+int nvme_capacity_mgmt(struct nvme_capacity_mgmt_args *args);
 
 /**
  * nvme_lockdown() - Issue lockdown command