Skip to content

Commit b2e51f9

Browse files
committed
Revert "fabrics: support unique discovery subsystem NQN"
This reverts commit 479c60c. There many things missing for proper TP8013/8014 support in 1.x. This introduces just regressions, hence drop it. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 54cdc2f commit b2e51f9

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

fabrics.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ struct connect_args {
8282
char *trsvcid;
8383
char *host_traddr;
8484
char *host_iface;
85-
char *subsystype;
8685
struct connect_args *next;
8786
struct connect_args *tail;
8887
};
@@ -297,13 +296,6 @@ static bool ctrl_matches_connectargs(const char *name, struct connect_args *args
297296
addr = nvme_get_ctrl_attr(path, "address");
298297
cargs.subsysnqn = nvme_get_ctrl_attr(path, "subsysnqn");
299298
cargs.transport = nvme_get_ctrl_attr(path, "transport");
300-
cargs.subsystype = nvme_get_ctrl_attr(path, "subsystype");
301-
if (!cargs.subsystype) {
302-
if (!strcmp(cargs.subsysnqn, NVME_DISC_SUBSYS_NAME))
303-
cargs.subsystype = strdup("discovery");
304-
else
305-
cargs.subsystype = strdup("nvm");
306-
}
307299

308300
if (!addr || !cargs.subsysnqn || !cargs.transport) {
309301
fprintf(stderr, "nvme_get_ctrl_attr failed\n");
@@ -315,7 +307,7 @@ static bool ctrl_matches_connectargs(const char *name, struct connect_args *args
315307
cargs.host_traddr = parse_conn_arg(addr, ' ', conarg_host_traddr);
316308
cargs.host_iface = parse_conn_arg(addr, ' ', conarg_host_iface);
317309

318-
if (!strcmp(cargs.subsystype, "discovery")) {
310+
if (!strcmp(cargs.subsysnqn, NVME_DISC_SUBSYS_NAME)) {
319311
char *kato_str = nvme_get_ctrl_attr(path, "kato"), *p;
320312
unsigned int kato = 0;
321313

@@ -424,7 +416,6 @@ static void destruct_connect_args(struct connect_args *cargs)
424416
free(cargs->trsvcid);
425417
free(cargs->host_traddr);
426418
free(cargs->host_iface);
427-
free(cargs->subsystype);
428419
}
429420

430421
static void free_connect_args(struct connect_args *cargs)

0 commit comments

Comments
 (0)