From 599303624eb084be1cdfd9e07ae79b33eab1641f Mon Sep 17 00:00:00 2001
From: Maciej Szwed <maciej.szwed@intel.com>
Date: Wed, 7 Jul 2021 22:09:53 +0200
Subject: [PATCH] nvme: Fix remove event processing bug

This patch fixes bug introduced by this patch:
https://github.com/spdk/spdk/commit/59237d22b82e864eb0cbd94348353f671f74cd92

lib/nvme/nvme_pcie.c:
ctrlr->remove_cb(ctrlr->cb_ctx, ctrlr) (line 147) -> ctrlr->remove_cb(cb_ctx, ctrlr) (line 123)

Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: I84c56aa7480fd597287f4935a583983eb96bc422
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8705
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 lib/nvme/nvme_pcie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c
index 24d6e889d..23f4d69b0 100644
--- a/lib/nvme/nvme_pcie.c
+++ b/lib/nvme/nvme_pcie.c
@@ -120,7 +120,7 @@ _nvme_pcie_event_process(struct spdk_pci_event *event, void *cb_ctx)
 		/* get the user app to clean up and stop I/O */
 		if (ctrlr->remove_cb) {
 			nvme_robust_mutex_unlock(&g_spdk_nvme_driver->lock);
-			ctrlr->remove_cb(cb_ctx, ctrlr);
+			ctrlr->remove_cb(ctrlr->cb_ctx, ctrlr);
 			nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);
 		}
 	}