Skip to content

Commit

Permalink
Merge pull request #1337 from hreinecke/disable-sqflow
Browse files Browse the repository at this point in the history
build: Update libnvme wrap
  • Loading branch information
hreinecke authored Jan 21, 2022
2 parents f86e5b1 + f77420d commit 6d6a08b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions fabrics.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ static int discover_from_conf_file(nvme_host_t h, const char *desc,
goto next;
nvme_ctrl_set_discovery_ctrl(c, true);
errno = 0;
ret = nvmf_add_ctrl(h, c, &cfg, false);
ret = nvmf_add_ctrl(h, c, &cfg);
if (!ret) {
__discover(c, &cfg, raw, connect,
persistent, flags);
Expand Down Expand Up @@ -546,7 +546,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
goto out_free;
}
nvme_ctrl_set_discovery_ctrl(c, true);
ret = nvmf_add_ctrl(h, c, &cfg, false);
ret = nvmf_add_ctrl(h, c, &cfg);
if (ret) {
nvme_msg(LOG_ERR,
"failed to add controller, error %d\n", errno);
Expand Down Expand Up @@ -676,7 +676,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
nvme_ctrl_set_dhchap_key(c, ctrlkey);

errno = 0;
ret = nvmf_add_ctrl(h, c, &cfg, cfg.disable_sqflow);
ret = nvmf_add_ctrl(h, c, &cfg);
if (ret)
nvme_msg(LOG_ERR, "no controller found\n");
else {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/libnvme.wrap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/linux-nvme/libnvme.git
revision = 63ea2203a4aa0d25590c585db35e274370f99717
revision = fcf7edfe4daf298ef4a2790666a9ba7b579f34e1

[provide]
libnvme = libnvme_dep

0 comments on commit 6d6a08b

Please sign in to comment.