Skip to content

Commit

Permalink
fabrics: align identify command payload
Browse files Browse the repository at this point in the history
The payload should be properly aligned.

Signed-off-by: Daniel Wagner <[email protected]>
  • Loading branch information
igaw committed Apr 10, 2024
1 parent 293e622 commit bce4879
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions fabrics.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ static nvme_ctrl_t create_discover_ctrl(nvme_root_t r, nvme_host_t h,
struct nvme_fabrics_config *cfg,
struct tr_config *trcfg)
{
_cleanup_free_ struct nvme_id_ctrl *id = NULL;
nvme_ctrl_t c;

c = __create_discover_ctrl(r, h, cfg, trcfg);
Expand All @@ -208,18 +209,20 @@ static nvme_ctrl_t create_discover_ctrl(nvme_root_t r, nvme_host_t h,
if (nvme_ctrl_is_unique_discovery_ctrl(c))
return c;

/* Find out the name of discovery controller */
struct nvme_id_ctrl id = { 0 };
id = nvme_alloc(sizeof(*id));
if (!id)
return NULL;

if (nvme_ctrl_identify(c, &id)) {
/* Find out the name of discovery controller */
if (nvme_ctrl_identify(c, id)) {
fprintf(stderr, "failed to identify controller, error %s\n",
nvme_strerror(errno));
nvme_disconnect_ctrl(c);
nvme_free_ctrl(c);
return NULL;
}

if (!strcmp(id.subnqn, NVME_DISC_SUBSYS_NAME))
if (!strcmp(id->subnqn, NVME_DISC_SUBSYS_NAME))
return c;

/*
Expand All @@ -229,7 +232,7 @@ static nvme_ctrl_t create_discover_ctrl(nvme_root_t r, nvme_host_t h,
nvme_disconnect_ctrl(c);
nvme_free_ctrl(c);

trcfg->subsysnqn = id.subnqn;
trcfg->subsysnqn = id->subnqn;
return __create_discover_ctrl(r, h, cfg, trcfg);
}

Expand Down

0 comments on commit bce4879

Please sign in to comment.