ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: Remove cntlid from spdk_nvmf_conn

Browse Source 
The cntlid is inside the session, so no need for
duplicate data.

Change-Id: I5669ee6393807959506dfec36a7583af77386fc4
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-07-07 15:56:03 -07:00
parent a9c7af9d83
commit 011c0a24df
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/nvmf/conn.c
View File

@ -307,7 +307,6 @@ nvmf_init_conn_properites(struct spdk_nvmf_conn *conn,
struct nvmf_session *session, struct nvmf_session *session,
struct spdk_nvmf_fabric_connect_rsp *response) struct spdk_nvmf_fabric_connect_rsp *response)
{ {
conn->cntlid = response->status_code_specific.success.cntlid;
nvmf_init_session_properties(session, conn->rdma.queue_depth); nvmf_init_session_properties(session, conn->rdma.queue_depth);
} }

1
lib/nvmf/conn.h
View File

@ -60,7 +60,6 @@ struct spdk_nvmf_conn {
struct nvmf_session *sess; struct nvmf_session *sess;
uint16_t qid; uint16_t qid;
uint16_t cntlid;
enum conn_type type; enum conn_type type;
volatile enum conn_state state; volatile enum conn_state state;

1
lib/nvmf/request.c
View File

@ -435,7 +435,6 @@ nvmf_process_connect(struct spdk_nvmf_request *req)
response = &req->rsp->connect_rsp; response = &req->rsp->connect_rsp;
conn->qid = connect->qid; conn->qid = connect->qid;
conn->cntlid = connect_data->cntlid;
if (conn->qid > 0) { if (conn->qid > 0) {
conn->type = CONN_TYPE_IOQ; conn->type = CONN_TYPE_IOQ;
} else { } else {

11
lib/nvmf/session.c
View File

@ -58,8 +58,7 @@ nvmf_create_session(const char *subnqn)
goto exit; goto exit;
subsystem->num_sessions++; subsystem->num_sessions++;
/* define cntlid that is unique across all subsystems */ session->cntlid = 0; /* Subsystems only have one controller by design, so cntlid is 0 */
session->cntlid = (subsystem->num << NVMF_CNTLID_SUBS_SHIFT) + subsystem->num_sessions;
TAILQ_INSERT_HEAD(&subsystem->sessions, session, entries); TAILQ_INSERT_HEAD(&subsystem->sessions, session, entries);
SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_create_session: allocated session cntlid %d\n", SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_create_session: allocated session cntlid %d\n",
@ -243,8 +242,8 @@ nvmf_connect(struct spdk_nvmf_conn *conn,
if (conn->type == CONN_TYPE_AQ) { if (conn->type == CONN_TYPE_AQ) {
/* For admin connections, establish a new session */ /* For admin connections, establish a new session */
SPDK_TRACELOG(SPDK_TRACE_NVMF, "CONNECT Admin Queue for controller id %d\n", conn->cntlid); SPDK_TRACELOG(SPDK_TRACE_NVMF, "CONNECT Admin Queue for controller id %d\n", connect_data->cntlid);
if (conn->cntlid != 0xFFFF) { if (connect_data->cntlid != 0xFFFF) {
/* This NVMf target only supports dynamic mode. */ /* This NVMf target only supports dynamic mode. */
SPDK_ERRLOG("The NVMf target only supports dynamic mode.\n"); SPDK_ERRLOG("The NVMf target only supports dynamic mode.\n");
response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM; response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM;
@ -257,10 +256,10 @@ nvmf_connect(struct spdk_nvmf_conn *conn,
return NULL; return NULL;
} }
} else { } else {
SPDK_TRACELOG(SPDK_TRACE_NVMF, "CONNECT I/O Queue for controller id %d\n", conn->cntlid); SPDK_TRACELOG(SPDK_TRACE_NVMF, "CONNECT I/O Queue for controller id %d\n", connect_data->cntlid);
session = nvmf_find_session_by_id(connect_data->subnqn, connect_data->cntlid); session = nvmf_find_session_by_id(connect_data->subnqn, connect_data->cntlid);
if (session == NULL) { if (session == NULL) {
SPDK_ERRLOG("Unknown controller id %d\n", conn->cntlid); SPDK_ERRLOG("Unknown controller id %d\n", connect_data->cntlid);
response->status.sc = SPDK_NVMF_FABRIC_SC_RESTART_DISCOVERY; response->status.sc = SPDK_NVMF_FABRIC_SC_RESTART_DISCOVERY;
return NULL; return NULL;
} }