From 33b8fe1a294d670d67a2e9802ca0c753826b1562 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Aug 2022 14:26:29 +0200 Subject: Merging upstream version 1.1. Signed-off-by: Daniel Baumann --- src/nvme/fabrics.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/nvme/fabrics.c') diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c index ee20da2..b68b7b9 100644 --- a/src/nvme/fabrics.c +++ b/src/nvme/fabrics.c @@ -438,20 +438,23 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr) if (!transport) { nvme_msg(h->r, LOG_ERR, "need a transport (-t) argument\n"); - return -ENVME_CONNECT_TARG; + errno = ENVME_CONNECT_TARG; + return -1; } if (strncmp(transport, "loop", 4)) { if (!nvme_ctrl_get_traddr(c)) { nvme_msg(h->r, LOG_ERR, "need a address (-a) argument\n"); - return -ENVME_CONNECT_AARG; + errno = ENVME_CONNECT_AARG; + return -1; } } /* always specify nqn as first arg - this will init the string */ if (asprintf(argstr, "nqn=%s", nvme_ctrl_get_subsysnqn(c)) < 0) { - return -ENOMEM; + errno = ENOMEM; + return -1; } if (!strcmp(nvme_ctrl_get_subsysnqn(c), NVME_DISC_SUBSYS_NAME)) { nvme_ctrl_set_discovery_ctrl(c, true); -- cgit v1.2.3