You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
93 lines
2.5 KiB
93 lines
2.5 KiB
11 months ago
|
From 5f872e9c1689078bf2c4e33108c1514da1a91497 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maurizio Lombardi <mlombard@redhat.com>
|
||
|
|
Date: Mon, 13 Nov 2023 10:49:35 +0100
|
||
|
|
Subject: [PATCH] Revert "fabrics: Use corresponding hostid when hostnqn is
|
||
|
|
generated"
|
||
|
|
|
||
|
|
This reverts commit 7d1c18f581e489e0cedfd9991bc97a2f8239cf82.
|
||
|
|
---
|
||
|
|
fabrics.c | 47 ++---------------------------------------------
|
||
|
|
1 file changed, 2 insertions(+), 45 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fabrics.c b/fabrics.c
|
||
|
|
index 57ca927fce9a..f4fb63f0c555 100644
|
||
|
|
--- a/fabrics.c
|
||
|
|
+++ b/fabrics.c
|
||
|
|
@@ -616,43 +616,6 @@ static int nvme_read_volatile_config(nvme_root_t r)
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
-char *nvmf_hostid_from_hostnqn(const char *hostnqn)
|
||
|
|
-{
|
||
|
|
- const char *uuid;
|
||
|
|
-
|
||
|
|
- if (!hostnqn)
|
||
|
|
- return NULL;
|
||
|
|
-
|
||
|
|
- uuid = strstr(hostnqn, "uuid:");
|
||
|
|
- if (!uuid)
|
||
|
|
- return NULL;
|
||
|
|
-
|
||
|
|
- return strdup(uuid + strlen("uuid:"));
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-void nvmf_check_hostid_and_hostnqn(const char *hostid, const char *hostnqn)
|
||
|
|
-{
|
||
|
|
- char *hostid_from_file, *hostid_from_hostnqn;
|
||
|
|
-
|
||
|
|
- if (!hostid)
|
||
|
|
- return;
|
||
|
|
-
|
||
|
|
- hostid_from_file = nvmf_hostid_from_file();
|
||
|
|
- if (hostid_from_file && strcmp(hostid_from_file, hostid)) {
|
||
|
|
- fprintf(stderr, "warning: use generated hostid instead of hostid file\n");
|
||
|
|
- free(hostid_from_file);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- if (!hostnqn)
|
||
|
|
- return;
|
||
|
|
-
|
||
|
|
- hostid_from_hostnqn = nvmf_hostid_from_hostnqn(hostnqn);
|
||
|
|
- if (hostid_from_hostnqn && strcmp(hostid_from_hostnqn, hostid)) {
|
||
|
|
- fprintf(stderr, "warning: use hostid which does not match uuid in hostnqn\n");
|
||
|
|
- free(hostid_from_hostnqn);
|
||
|
|
- }
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
|
||
|
|
{
|
||
|
|
char *subsysnqn = NVME_DISC_SUBSYS_NAME;
|
||
|
|
@@ -729,13 +692,10 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
|
||
|
|
hostid_arg = hostid;
|
||
|
|
if (!hostnqn)
|
||
|
|
hostnqn = hnqn = nvmf_hostnqn_from_file();
|
||
|
|
- if (!hostnqn) {
|
||
|
|
+ if (!hostnqn)
|
||
|
|
hostnqn = hnqn = nvmf_hostnqn_generate();
|
||
|
|
- hostid = hid = nvmf_hostid_from_hostnqn(hostnqn);
|
||
|
|
- }
|
||
|
|
if (!hostid)
|
||
|
|
hostid = hid = nvmf_hostid_from_file();
|
||
|
|
- nvmf_check_hostid_and_hostnqn(hostid, hostnqn);
|
||
|
|
h = nvme_lookup_host(r, hostnqn, hostid);
|
||
|
|
if (!h) {
|
||
|
|
ret = ENOMEM;
|
||
|
|
@@ -946,13 +906,10 @@ int nvmf_connect(const char *desc, int argc, char **argv)
|
||
|
|
|
||
|
|
if (!hostnqn)
|
||
|
|
hostnqn = hnqn = nvmf_hostnqn_from_file();
|
||
|
|
- if (!hostnqn) {
|
||
|
|
+ if (!hostnqn)
|
||
|
|
hostnqn = hnqn = nvmf_hostnqn_generate();
|
||
|
|
- hostid = hid = nvmf_hostid_from_hostnqn(hostnqn);
|
||
|
|
- }
|
||
|
|
if (!hostid)
|
||
|
|
hostid = hid = nvmf_hostid_from_file();
|
||
|
|
- nvmf_check_hostid_and_hostnqn(hostid, hostnqn);
|
||
|
|
h = nvme_lookup_host(r, hostnqn, hostid);
|
||
|
|
if (!h) {
|
||
|
|
errno = ENOMEM;
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|