Merging upstream version 2.6.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
52cbdbff70
commit
407776cd14
262 changed files with 7434 additions and 3024 deletions
4
nbft.c
4
nbft.c
|
@ -144,7 +144,7 @@ int discover_from_nbft(nvme_root_t r, char *hostnqn_arg, char *hostid_arg,
|
|||
};
|
||||
|
||||
/* Already connected ? */
|
||||
cl = lookup_ctrl(r, &trcfg);
|
||||
cl = lookup_ctrl(h, &trcfg);
|
||||
if (cl && nvme_ctrl_get_name(cl))
|
||||
continue;
|
||||
|
||||
|
@ -170,7 +170,7 @@ int discover_from_nbft(nvme_root_t r, char *hostnqn_arg, char *hostid_arg,
|
|||
nvme_free_ctrl(c);
|
||||
|
||||
trcfg.host_traddr = NULL;
|
||||
cl = lookup_ctrl(r, &trcfg);
|
||||
cl = lookup_ctrl(h, &trcfg);
|
||||
if (cl && nvme_ctrl_get_name(cl))
|
||||
continue;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue