From 5f523c44f01034ea56c8c442ed0ca31be09be397 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Sat, 19 Dec 2020 02:41:30 +0900 Subject: [PATCH] bdev/nvme: Consolidate exit paths of connect_attach_cb() Signed-off-by: Shuhei Matsumoto Change-Id: Ife0bc6575697dee5a470793361502a852b132191 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5651 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris --- module/bdev/nvme/bdev_nvme.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 0d1431444..04ea5e13d 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1923,22 +1923,23 @@ connect_attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, rc = bdev_nvme_add_trid(nvme_bdev_ctrlr, ctrlr, &ctx->trid); spdk_nvme_detach(ctrlr); - - populate_namespaces_cb(ctx, 0, rc); - return; + goto exit; } rc = nvme_bdev_ctrlr_create(ctrlr, ctx->base_name, &ctx->trid, ctx->prchk_flags); if (rc) { SPDK_ERRLOG("Failed to create new device\n"); - populate_namespaces_cb(ctx, 0, rc); - return; + goto exit; } nvme_bdev_ctrlr = nvme_bdev_ctrlr_get(&ctx->trid); assert(nvme_bdev_ctrlr != NULL); nvme_ctrlr_populate_namespaces(nvme_bdev_ctrlr, ctx); + return; + +exit: + populate_namespaces_cb(ctx, 0, rc); } static int