From 6779479067e1b0e0881a99e74a4c18fc31a91619 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 31 Jul 2018 14:28:01 -0700 Subject: [PATCH] nvmf: Simplify spdk_nvmf_qpair_disconnect Asking which thread we're currently on is more expensive than sending a message. Change-Id: I9d9007c9f7f30e4cdd9a97de6bf7a10b0e2a0594 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/420933 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu --- lib/nvmf/nvmf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 26ce63b46..5cafe5c17 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -767,12 +767,8 @@ spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconnect_ qpair_ctx->cb_fn = cb_fn; qpair_ctx->thread = qpair->group->thread; qpair_ctx->ctx = ctx; - if (qpair->group->thread == spdk_get_thread()) { - _spdk_nvmf_qpair_deactivate(qpair_ctx); - } else { - /* Send a message to the thread that owns this qpair */ - spdk_thread_send_msg(qpair->group->thread, _spdk_nvmf_qpair_deactivate, qpair_ctx); - } + /* Send a message to the thread that owns this qpair */ + spdk_thread_send_msg(qpair->group->thread, _spdk_nvmf_qpair_deactivate, qpair_ctx); return 0; }