d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvmf: fix negative path for add transport to tgt

Browse Source 
in case of failure groups shall be destroyed

Signed-off-by: Jacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I8933f4128a7a3361bbb55d6a9c08a540521e5bda
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10435
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Jacek Kalwas 2021-11-26 06:51:14 -05:00 committed by Tomasz Zawadzki
parent 8e38b9882f
commit 5c0e1c2663
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/nvmf/nvmf.c
View File

@ -717,18 +717,52 @@ struct spdk_nvmf_tgt_add_transport_ctx {
struct spdk_nvmf_transport *transport;
spdk_nvmf_tgt_add_transport_done_fn cb_fn;
void *cb_arg;
int status;
};
static void
_nvmf_tgt_remove_transport_done(struct spdk_io_channel_iter *i, int status)
{
struct spdk_nvmf_tgt_add_transport_ctx *ctx = spdk_io_channel_iter_get_ctx(i);
ctx->cb_fn(ctx->cb_arg, ctx->status);
free(ctx);
}
static void
_nvmf_tgt_remove_transport(struct spdk_io_channel_iter *i)
{
struct spdk_nvmf_tgt_add_transport_ctx *ctx = spdk_io_channel_iter_get_ctx(i);
struct spdk_io_channel *ch = spdk_io_channel_iter_get_channel(i);
struct spdk_nvmf_poll_group *group = spdk_io_channel_get_ctx(ch);
struct spdk_nvmf_transport_poll_group *tgroup, *tmp;
TAILQ_FOREACH_SAFE(tgroup, &group->tgroups, link, tmp) {
if (tgroup->transport == ctx->transport) {
TAILQ_REMOVE(&group->tgroups, tgroup, link);
nvmf_transport_poll_group_destroy(tgroup);
}
}
spdk_for_each_channel_continue(i, 0);
}
static void
_nvmf_tgt_add_transport_done(struct spdk_io_channel_iter *i, int status)
{
struct spdk_nvmf_tgt_add_transport_ctx *ctx = spdk_io_channel_iter_get_ctx(i);
if (!status) {
ctx->transport->tgt = ctx->tgt;
TAILQ_INSERT_TAIL(&ctx->tgt->transports, ctx->transport, link);
if (status) {
ctx->status = status;
spdk_for_each_channel(ctx->tgt,
_nvmf_tgt_remove_transport,
ctx,
_nvmf_tgt_remove_transport_done);
return;
}
ctx->transport->tgt = ctx->tgt;
TAILQ_INSERT_TAIL(&ctx->tgt->transports, ctx->transport, link);
ctx->cb_fn(ctx->cb_arg, status);
free(ctx);
}