Merging upstream version 2.9.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
bb95f41000
commit
698d985f9d
451 changed files with 5896 additions and 2734 deletions
21
nvme-wrap.c
21
nvme-wrap.c
|
@ -100,17 +100,16 @@ int nvme_cli_identify_allocated_ns_list(struct nvme_dev *dev, __u32 nsid,
|
|||
return do_admin_op(identify_allocated_ns_list, dev, nsid, list);
|
||||
}
|
||||
|
||||
int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,
|
||||
int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u16 cntid,
|
||||
struct nvme_primary_ctrl_cap *cap)
|
||||
{
|
||||
return do_admin_op(identify_primary_ctrl, dev, nsid, cap);
|
||||
return do_admin_op(identify_primary_ctrl, dev, cntid, cap);
|
||||
}
|
||||
|
||||
int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,
|
||||
__u16 ctrl_id,
|
||||
int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev, __u16 cntid,
|
||||
struct nvme_secondary_ctrl_list *sc_list)
|
||||
{
|
||||
return do_admin_op(identify_secondary_ctrl_list, dev, ctrl_id,
|
||||
return do_admin_op(identify_secondary_ctrl_list, dev, cntid,
|
||||
sc_list);
|
||||
}
|
||||
|
||||
|
@ -264,12 +263,6 @@ int nvme_cli_get_log_ana(struct nvme_dev *dev,
|
|||
return do_admin_op(get_log_ana, dev, lsp, rae, offset, len, log);
|
||||
}
|
||||
|
||||
int nvme_cli_get_log_ana_groups(struct nvme_dev *dev, bool rae, __u32 len,
|
||||
struct nvme_ana_group_desc *log)
|
||||
{
|
||||
return do_admin_op(get_log_ana_groups, dev, rae, len, log);
|
||||
}
|
||||
|
||||
int nvme_cli_get_log_lba_status(struct nvme_dev *dev, bool rae,
|
||||
__u64 offset, __u32 len, void *log)
|
||||
{
|
||||
|
@ -428,9 +421,3 @@ int nvme_cli_security_receive(struct nvme_dev *dev,
|
|||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
void nvme_cli_set_debug(struct nvme_dev *dev, bool set)
|
||||
{
|
||||
if (dev->type == NVME_DEV_DIRECT)
|
||||
nvme_set_debug(set);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue