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

Merging upstream version 2.12.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-03-20 08:10:44 +01:00
parent 078c0dbcc0
commit 635faa7346
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
571 changed files with 10718 additions and 2738 deletions
Download patch file Download diff file Expand all files Collapse all files

32
fabrics.c
View file

@ -681,6 +681,7 @@ static int nvme_read_config_checked(nvme_root_t r, const char *filename)
return 0;
}
/* returns negative errno values */
int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
{
char *subsysnqn = NVME_DISC_SUBSYS_NAME;
@ -757,7 +758,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
if (ret < 0) {
fprintf(stderr, "Failed to scan topology: %s\n",
nvme_strerror(errno));
return ret;
return -errno;
}
ret = nvme_host_get_ids(r, hostnqn, hostid, &hnqn, &hid);
@ -766,7 +767,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
h = nvme_lookup_host(r, hnqn, hid);
if (!h) {
ret = ENOMEM;
ret = -ENOMEM;
goto out_free;
}
@ -781,10 +782,9 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
if (!device && !transport && !traddr) {
if (!nonbft)
discover_from_nbft(r, hostnqn, hostid,
hnqn, hid, desc, connect,
&cfg, nbft_path, flags, verbose);
ret = discover_from_nbft(r, hostnqn, hostid,
hnqn, hid, desc, connect,
&cfg, nbft_path, flags, verbose);
if (nbft)
goto out_free;
@ -876,7 +876,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
fprintf(stderr,
"failed to add controller, error %s\n",
nvme_strerror(errno));
ret = errno;
ret = -errno;
goto out_free;
}
}
@ -1189,6 +1189,11 @@ int nvmf_disconnect(const char *desc, int argc, char **argv)
if (ret)
return ret;
if (cfg.nqn && cfg.device) {
fprintf(stderr,
"Both device name [--device | -d] and NQN [--nqn | -n] are specified\n");
return -EINVAL;
}
if (!cfg.nqn && !cfg.device) {
fprintf(stderr,
"Neither device name [--device | -d] nor NQN [--nqn | -n] provided\n");
@ -1430,7 +1435,7 @@ int nvmf_config(const char *desc, int argc, char **argv)
return 0;
}
static void dim_operation(nvme_ctrl_t c, enum nvmf_dim_tas tas, const char *name)
static int dim_operation(nvme_ctrl_t c, enum nvmf_dim_tas tas, const char *name)
{
static const char * const task[] = {
[NVMF_DIM_TAS_REGISTER] = "register",
@ -1451,6 +1456,8 @@ static void dim_operation(nvme_ctrl_t c, enum nvmf_dim_tas tas, const char *name
fprintf(stderr, "%s DIM %s command error. Result:0x%04x, Status:0x%04x - %s\n",
name, t, result, status, nvme_status_to_string(status, false));
}
return nvme_status_to_errno(status, true);
}
int nvmf_dim(const char *desc, int argc, char **argv)
@ -1530,9 +1537,8 @@ int nvmf_dim(const char *desc, int argc, char **argv)
nvme_for_each_subsystem(h, s) {
if (strcmp(nvme_subsystem_get_nqn(s), p))
continue;
nvme_subsystem_for_each_ctrl(s, c) {
dim_operation(c, tas, p);
}
nvme_subsystem_for_each_ctrl(s, c)
ret = dim_operation(c, tas, p);
}
}
}
@ -1551,9 +1557,9 @@ int nvmf_dim(const char *desc, int argc, char **argv)
p, nvme_strerror(errno));
return -errno;
}
dim_operation(c, tas, p);
ret = dim_operation(c, tas, p);
}
}
return 0;
return ret;
}