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

nvmf: don't store connection QID

Browse Source 
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 <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-13 16:57:37 -07:00
parent 3f80d55199
commit 31965a7021
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nvmf/conn.c
View File

@ -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;

2
lib/nvmf/conn.h
View File

@ -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;

5
lib/nvmf/rdma.c
View File

@ -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) {

3
lib/nvmf/request.c
View File

@ -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;