nvme/nvme-cli
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.5.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:24:13 +01:00
parent 3d70d3c76b
commit ee6621a5b2
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
507 changed files with 19440 additions and 17258 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nvme-wrap.c
View file

@ -40,7 +40,6 @@
int __rc; \
if (d->type == NVME_DEV_DIRECT) { \
args->fd = d->direct.fd; \
args->timeout = NVME_DEFAULT_IOCTL_TIMEOUT; \
__rc = nvme_ ## op(args); \
} else if (d->type == NVME_DEV_MI) \
__rc = nvme_mi_admin_ ## op (d->mi.ctrl, args); \
@ -377,14 +376,16 @@ int nvme_cli_admin_passthru(struct nvme_dev *dev, __u8 opcode, __u8 flags,
/* The MI & direct interfaces don't have an exactly-matching API for
* ns_mgmt_create, as we don't support a timeout for MI.
*/
int nvme_cli_ns_mgmt_create(struct nvme_dev *dev, struct nvme_id_ns *ns,
int nvme_cli_ns_mgmt_create(struct nvme_dev *dev,
struct nvme_ns_mgmt_host_sw_specified *data,
__u32 *nsid, __u32 timeout, __u8 csi)
{
if (dev->type == NVME_DEV_DIRECT)
return nvme_ns_mgmt_create(dev_fd(dev), ns, nsid, timeout, csi);
return nvme_ns_mgmt_create(dev_fd(dev), NULL, nsid, timeout,
csi, data);
if (dev->type == NVME_DEV_MI)
return nvme_mi_admin_ns_mgmt_create(dev->mi.ctrl, ns,
csi, nsid);
return nvme_mi_admin_ns_mgmt_create(dev->mi.ctrl, NULL,
csi, nsid, data);
return -ENODEV;
}