diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-06-30 22:38:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-06-30 22:38:51 +0000 |
| commit | 5d64e8a26388e2abbf6a6585d17392d6e944ae7b (patch) | |
| tree | 4eae47918df5f83f14e05bede9c361237a7dc089 /nvme-wrap.c | |
| parent | Releasing debian version 2.4+really2.4-3. (diff) | |
| download | nvme-cli-5d64e8a26388e2abbf6a6585d17392d6e944ae7b.tar.xz nvme-cli-5d64e8a26388e2abbf6a6585d17392d6e944ae7b.zip | |
Merging upstream version 2.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'nvme-wrap.c')
| -rw-r--r-- | nvme-wrap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nvme-wrap.c b/nvme-wrap.c index cee9b23..faea690 100644 --- a/nvme-wrap.c +++ b/nvme-wrap.c @@ -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; } |