Use argument structure for nvme_lockdown()

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

@@ -1398,18 +1398,23 @@ int nvme_capacity_mgmt(struct nvme_capacity_mgmt_args *args)
 	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
-int nvme_lockdown(int fd, __u8 scp, __u8 prhbt, __u8 ifc, __u8 ofi,
-		  __u8 uuid)
+int nvme_lockdown(struct nvme_lockdown_args *args)
 {
-	__u32 cdw10 =  ofi << 8 | (ifc & 0x3) << 5 | (prhbt & 0x1) << 4 | (scp & 0xF);
+	__u32 cdw10 =  args->ofi << 8 |
+		(args->ifc & 0x3) << 5 |
+		(args->prhbt & 0x1) << 4 |
+		(args->scp & 0xF);
 
 	struct nvme_passthru_cmd cmd = {
 		.opcode         = nvme_admin_lockdown,
 		.cdw10          = cdw10,
-		.cdw14          = uuid & 0x3F,
+		.cdw14          = args->uuidx & 0x3F,
+		.timeout_ms	= args->timeout,
 	};
 
-	return nvme_submit_admin_passthru(fd, &cmd, NULL);
+	if (args->args_size < sizeof(*args))
+		return -EINVAL;
+	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
 int nvme_set_property(int fd, int offset, __u64 value,

src/nvme/ioctl.h

@@ -3349,19 +3349,36 @@ struct nvme_capacity_mgmt_args {
 int nvme_capacity_mgmt(struct nvme_capacity_mgmt_args *args);
 
 /**
- * nvme_lockdown() - Issue lockdown command
+ * nvme_lockdown_args - Arguments for the NVME Lockdown command
  * @fd:		File descriptor of nvme device
- * @scp:
- * @prhbt:
- * @ifc:
- * @ofi:
- * @uuid:
+ * @scp:	Scope of the command
+ * @prhbt:	Prohibit or allow the command opcode or Set Features command
+ * @ifc:	Affected interface
+ * @ofi:	Opcode or Feature Identifier
+ * @uuid:	UUID Index if controller supports this id selection method
+ * @timeout:	Timeout in ms (0 for default timeout)
+ * @result:	The command completion result from CQE dword0
+ */
+struct nvme_lockdown_args {
+	int args_size;
+	int fd;
+	__u8 scp;
+	__u8 prhbt;
+	__u8 ifc;
+	__u8 ofi;
+	__u8 uuidx;
+	__u32 timeout;
+	__u32 *result;
+};
+
+/**
+ * nvme_lockdown() - Issue lockdown command
+ * @args:	&struct nvme_lockdown_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_lockdown(int fd, __u8 scp, __u8 prhbt, __u8 ifc, __u8 ofi,
-		  __u8 uuid);
+int nvme_lockdown(struct nvme_lockdown_args *args);
 
 /**
  * nvme_set_property() - Set controller property