Skip to content

Commit b97d8b3

Browse files
committed
fabrics: Remove nvmf_add_ctrl_opts()
Unused, and nvmf_add_ctrl() is doing exactly the same. Signed-off-by: Hannes Reinecke <[email protected]>
1 parent fcf7edf commit b97d8b3

2 files changed

Lines changed: 0 additions & 42 deletions

File tree

src/nvme/fabrics.c

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -553,39 +553,6 @@ static int __nvmf_add_ctrl(const char *argstr)
553553
return ret;
554554
}
555555

556-
int nvmf_add_ctrl_opts(nvme_ctrl_t c, struct nvme_fabrics_config *cfg)
557-
{
558-
nvme_subsystem_t s = nvme_ctrl_get_subsystem(c);
559-
nvme_host_t h = nvme_subsystem_get_host(s);
560-
char *argstr;
561-
int ret;
562-
563-
cfg = merge_config(c, cfg);
564-
if (traddr_is_hostname(c)) {
565-
ret = hostname2traddr(c);
566-
if (ret) {
567-
errno = -ret;
568-
return -1;
569-
}
570-
}
571-
572-
ret = build_options(h, c, &argstr);
573-
if (ret) {
574-
errno = -ret;
575-
return -1;
576-
}
577-
578-
ret = __nvmf_add_ctrl(argstr);
579-
free(argstr);
580-
if (ret < 0) {
581-
errno = -ret;
582-
ret = -1;
583-
} else {
584-
nvme_msg(LOG_INFO, "nvme%d: ctrl connected\n", ret);
585-
}
586-
return ret;
587-
}
588-
589556
int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
590557
const struct nvme_fabrics_config *cfg)
591558
{

src/nvme/fabrics.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,6 @@ const char *nvmf_cms_str(__u8 cms);
150150
*/
151151
void nvmf_default_config(struct nvme_fabrics_config *cfg);
152152

153-
/**
154-
* nvmf_add_ctrl_opts() -
155-
* @c:
156-
* @cfg:
157-
*
158-
* Return:
159-
*/
160-
int nvmf_add_ctrl_opts(nvme_ctrl_t c, struct nvme_fabrics_config *cfg);
161-
162153
/**
163154
* nvmf_add_ctrl() - Connect a controller and update topology
164155
* @h: Host to which the controller should be attached

0 commit comments

Comments
 (0)