From 31965a7021f4de8ac6c38b9badcbc5490ca9ed69 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 13 Jul 2016 16:57:37 -0700 Subject: [PATCH] nvmf: don't store connection QID Drop the debug print in conn.c that was the only user. We still have the connect data structure when determining the connection type, and after that point, the queue ID is not needed. Change-Id: Ida9e170099f977ec6b84478874863c40d6f7d8a1 Signed-off-by: Daniel Verkamp --- lib/nvmf/conn.c | 3 +-- lib/nvmf/conn.h | 2 -- lib/nvmf/rdma.c | 5 ----- lib/nvmf/request.c | 3 +-- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/nvmf/conn.c b/lib/nvmf/conn.c index 8ef8ccfcc..d8f23d0d0 100644 --- a/lib/nvmf/conn.c +++ b/lib/nvmf/conn.c @@ -89,8 +89,7 @@ spdk_nvmf_startup_conn(struct spdk_nvmf_conn *conn) } conn->state = CONN_STATE_RUNNING; - SPDK_NOTICELOG("Launching nvmf connection[qid=%d] on core: %d\n", - conn->qid, lcore); + SPDK_NOTICELOG("Launching nvmf connection on core: %d\n", lcore); conn->poller.fn = spdk_nvmf_conn_do_work; conn->poller.arg = conn; diff --git a/lib/nvmf/conn.h b/lib/nvmf/conn.h index 779cceee1..45023663e 100644 --- a/lib/nvmf/conn.h +++ b/lib/nvmf/conn.h @@ -56,8 +56,6 @@ enum conn_type { struct spdk_nvmf_conn { struct nvmf_session *sess; - uint16_t qid; - enum conn_type type; volatile enum conn_state state; diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 864221567..895db3507 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -650,18 +650,13 @@ nvmf_rdma_connect(struct rdma_cm_event *event) /* No private data, so use defaults. */ qp_depth = nvmf_min(ibdev_attr.max_qp_wr, SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH); rw_depth = nvmf_min(ibdev_attr.max_qp_rd_atom, SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH); - conn->qid = 0; } else { const struct spdk_nvmf_rdma_request_private_data *private_data = host_event_data->private_data; qp_depth = nvmf_min(ibdev_attr.max_qp_wr, nvmf_min(private_data->hrqsize, private_data->hsqsize)); rw_depth = nvmf_min(ibdev_attr.max_qp_rd_atom, host_event_data->initiator_depth); - conn->qid = private_data->qid; } rdma_conn->queue_depth = nvmf_min(qp_depth, rw_depth); - if (conn->qid > 0) { - conn->type = CONN_TYPE_IOQ; - } rc = nvmf_rdma_queue_init(conn, conn_id->verbs); if (rc) { diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c index 9c48e00ef..57c48ddb3 100644 --- a/lib/nvmf/request.c +++ b/lib/nvmf/request.c @@ -428,8 +428,7 @@ nvmf_process_connect(struct spdk_nvmf_request *req) response = &req->rsp->connect_rsp; - conn->qid = connect->qid; - if (conn->qid > 0) { + if (connect->qid > 0) { conn->type = CONN_TYPE_IOQ; } else { conn->type = CONN_TYPE_AQ;