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

Merging upstream version 2.13.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-04-13 11:50:38 +02:00
parent adb2e5e05d
commit 8599c7290c
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
579 changed files with 6165 additions and 1687 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nvme.c
View file

@ -2953,9 +2953,6 @@ static int nvme_attach_ns(int argc, char **argv, int attach, const char *desc, s
num = argconfig_parse_comma_sep_array_u16(cfg.cntlist,
list, ARRAY_SIZE(list));
if (!num)
fprintf(stderr, "warning: empty controller-id list will result in no actual change in namespace attachment\n");
if (num == -1) {
nvme_show_error("%s: controller id list is malformed", cmd->name);
return -EINVAL;
@ -2965,7 +2962,18 @@ static int nvme_attach_ns(int argc, char **argv, int attach, const char *desc, s
if (!cntlist)
return -ENOMEM;
nvme_init_ctrl_list(cntlist, num, list);
if (argconfig_parse_seen(opts, "controllers")) {
nvme_init_ctrl_list(cntlist, num, list);
} else {
struct nvme_id_ctrl ctrl = { 0 };
if (nvme_cli_identify_ctrl(dev, &ctrl)) {
perror("identify-ctrl");
return -errno;
}
cntlist->num = cpu_to_le16(1);
cntlist->identifier[0] = ctrl.cntlid;
}
if (attach)
err = nvme_cli_ns_attach_ctrls(dev, cfg.namespace_id,
@ -3946,7 +3954,7 @@ static int cmd_set_independent_id_ns(int argc, char **argv, struct command *cmd,
flags |= VERBOSE;
if (!cfg.namespace_id) {
err = cfg.namespace_id = nvme_get_nsid(dev_fd(dev), &cfg.namespace_id);
err = nvme_get_nsid(dev_fd(dev), &cfg.namespace_id);
if (err < 0) {
nvme_show_perror("get-namespace-id");
return err;
@ -7245,6 +7253,7 @@ static int write_zeroes(int argc, char **argv, struct command *cmd, struct plugi
.slba = cfg.start_block,
.nlb = cfg.block_count,
.control = control,
.reftag = (__u32)cfg.ref_tag,
.reftag_u64 = cfg.ref_tag,
.apptag = cfg.app_tag,
.appmask = cfg.app_tag_mask,
@ -8309,6 +8318,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
.sts = sts,
.pif = pif,
.dspec = cfg.dspec,
.reftag = (__u32)cfg.ref_tag,
.reftag_u64 = cfg.ref_tag,
.apptag = cfg.app_tag,
.appmask = cfg.app_tag_mask,
@ -8485,6 +8495,7 @@ static int verify_cmd(int argc, char **argv, struct command *cmd, struct plugin
.slba = cfg.start_block,
.nlb = cfg.block_count,
.control = control,
.reftag = cfg.ref_tag,
.reftag_u64 = cfg.ref_tag,
.apptag = cfg.app_tag,
.appmask = cfg.app_tag_mask,