From: Andy Lutomirski <luto@kernel.org>
To: linux-nvme@lists.infradead.org
Cc: Andy Lutomirski <luto@kernel.org>
Subject: [PATCH 2/4] fabrics: Rename nvmf_hostnqn_file() to nvmf_hostnqn_load()
Date: Thu, 19 Dec 2019 19:31:03 -0800 [thread overview]
Message-ID: <99abbf25acb4659010d66fee63bd0924032bb0da.1576726427.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1576726427.git.luto@kernel.org>
The old name was confusing, since the value didn't necessarily come
from a file.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
fabrics.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fabrics.c b/fabrics.c
index 12be2e73986e..4448416f9855 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -721,7 +721,7 @@ char *hostnqn_read(void)
return NULL;
}
-static int nvmf_hostnqn_file(void)
+static int nvmf_hostnqn_load(void)
{
cfg.hostnqn = hostnqn_read();
@@ -827,7 +827,7 @@ static int build_options(char *argstr, int max_len, bool discover)
add_argument(&argstr, &max_len, "traddr", cfg.traddr) ||
add_argument(&argstr, &max_len, "host_traddr", cfg.host_traddr) ||
add_argument(&argstr, &max_len, "trsvcid", cfg.trsvcid) ||
- ((cfg.hostnqn || nvmf_hostnqn_file()) &&
+ ((cfg.hostnqn || nvmf_hostnqn_load()) &&
add_argument(&argstr, &max_len, "hostnqn", cfg.hostnqn)) ||
((cfg.hostid || nvmf_hostid_file()) &&
add_argument(&argstr, &max_len, "hostid", cfg.hostid)) ||
--
2.23.0
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2019-12-20 3:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 3:31 [PATCH 0/4] systemd ID improvements Andy Lutomirski
2019-12-20 3:31 ` [PATCH 1/4] hostnqn: Fix the systemd-based NQN namespace to comply with the spec Andy Lutomirski
2019-12-20 3:31 ` Andy Lutomirski [this message]
2019-12-20 3:31 ` [PATCH 3/4] Use systemd-generated hostid if no hostid is configured Andy Lutomirski
2020-01-03 18:14 ` David Milburn
2020-01-13 19:14 ` Andy Lutomirski
2019-12-20 3:31 ` [PATCH 4/4] Do not install /etc/nvme/hostid or /etc/nvme/hostnqn by default Andy Lutomirski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=99abbf25acb4659010d66fee63bd0924032bb0da.1576726427.git.luto@kernel.org \
--to=luto@kernel.org \
--cc=linux-nvme@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).