Commit b1e3279a authored by Ziye Yang's avatar Ziye Yang Committed by Daniel Verkamp
Browse files

nvmf: change nvmf_session to spdk_nvmf_session 



Make the structure definition consistent

Change-Id: If147066cee041a2a357bc7efcb1f882f914e5b42
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
parent 658faa3d

lib/nvmf/direct.c

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "spdk/trace.h"



static void

nvmf_direct_ctrlr_get_data(struct nvmf_session *session)

nvmf_direct_ctrlr_get_data(struct spdk_nvmf_session *session)

{

	const struct spdk_nvme_ctrlr_data	*cdata;
@@ -49,7 +49,7 @@ nvmf_direct_ctrlr_get_data(struct nvmf_session *session) 
}



static void

nvmf_direct_ctrlr_poll_for_completions(struct nvmf_session *session)

nvmf_direct_ctrlr_poll_for_completions(struct spdk_nvmf_session *session)

{

	spdk_nvme_ctrlr_process_admin_completions(session->subsys->dev.direct.ctrlr);

	spdk_nvme_qpair_process_completions(session->subsys->dev.direct.io_qpair, 0);
@@ -104,7 +104,7 @@ nvmf_direct_ctrlr_admin_identify_nslist(struct spdk_nvme_ctrlr *ctrlr, 
static int

nvmf_direct_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req)

{

	struct nvmf_session *session = req->conn->sess;

	struct spdk_nvmf_session *session = req->conn->sess;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

	struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;

	struct spdk_nvmf_subsystem *subsystem = session->subsys;

lib/nvmf/rdma.c

+3 −3
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int 
nvmf_rdma_disconnect(struct rdma_cm_event *evt)

{

	struct spdk_nvmf_conn		*conn;

	struct nvmf_session		*session;

	struct spdk_nvmf_session	*session;

	struct spdk_nvmf_subsystem	*subsystem;

	struct spdk_nvmf_rdma_conn 	*rdma_conn;
@@ -1056,7 +1056,7 @@ spdk_nvmf_rdma_acceptor_fini(void) 
}



static int

spdk_nvmf_rdma_session_init(struct nvmf_session *session, struct spdk_nvmf_conn *conn)

spdk_nvmf_rdma_session_init(struct spdk_nvmf_session *session, struct spdk_nvmf_conn *conn)

{

	struct spdk_nvmf_rdma_session	*rdma_sess;

	struct spdk_nvmf_rdma_conn	*rdma_conn = get_rdma_conn(conn);
@@ -1106,7 +1106,7 @@ spdk_nvmf_rdma_session_init(struct nvmf_session *session, struct spdk_nvmf_conn 
}



static void

spdk_nvmf_rdma_session_fini(struct nvmf_session *session)

spdk_nvmf_rdma_session_fini(struct spdk_nvmf_session *session)

{

	struct spdk_nvmf_rdma_session *rdma_sess = session->trctx;

lib/nvmf/request.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ spdk_nvmf_request_complete(struct spdk_nvmf_request *req) 
static spdk_nvmf_request_exec_status

nvmf_process_discovery_cmd(struct spdk_nvmf_request *req)

{

	struct nvmf_session *session = req->conn->sess;

	struct spdk_nvmf_session *session = req->conn->sess;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

	struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;

	struct spdk_nvmf_discovery_log_page *log;
@@ -317,7 +317,7 @@ nvmf_trace_command(union nvmf_h2c_msg *h2c_msg, enum conn_type conn_type) 
int

spdk_nvmf_request_exec(struct spdk_nvmf_request *req)

{

	struct nvmf_session *session = req->conn->sess;

	struct spdk_nvmf_session *session = req->conn->sess;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

	struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl;

	spdk_nvmf_request_exec_status status;

lib/nvmf/session.c

+17 −17
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "spdk/nvme_spec.h"



static void

nvmf_init_discovery_session_properties(struct nvmf_session *session)

nvmf_init_discovery_session_properties(struct spdk_nvmf_session *session)

{

	session->vcdata.maxcmd = g_nvmf_tgt.max_queue_depth;

	/* extended data for get log page supportted */
@@ -83,7 +83,7 @@ nvmf_init_discovery_session_properties(struct nvmf_session *session) 
}



static void

nvmf_init_nvme_session_properties(struct nvmf_session *session)

nvmf_init_nvme_session_properties(struct spdk_nvmf_session *session)

{

	assert((g_nvmf_tgt.max_io_size % 4096) == 0);
@@ -156,7 +156,7 @@ nvmf_init_nvme_session_properties(struct nvmf_session *session) 
		      session->vcprop.csts.raw);

}



static void session_destruct(struct nvmf_session *session)

static void session_destruct(struct spdk_nvmf_session *session)

{

	session->subsys->session = NULL;

	session->transport->session_fini(session);
@@ -164,7 +164,7 @@ static void session_destruct(struct nvmf_session *session) 
}



void

spdk_nvmf_session_destruct(struct nvmf_session *session)

spdk_nvmf_session_destruct(struct spdk_nvmf_session *session)

{

	while (!TAILQ_EMPTY(&session->connections)) {

		struct spdk_nvmf_conn *conn = TAILQ_FIRST(&session->connections);
@@ -192,7 +192,7 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn, 
			  struct spdk_nvmf_fabric_connect_data *data,

			  struct spdk_nvmf_fabric_connect_rsp *rsp)

{

	struct nvmf_session *session;

	struct spdk_nvmf_session *session;

	struct spdk_nvmf_subsystem *subsystem;



#define INVALID_CONNECT_CMD(field) invalid_connect_response(rsp, 0, offsetof(struct spdk_nvmf_fabric_connect_cmd, field))
@@ -253,7 +253,7 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn, 
		}



		/* Establish a new session */

		subsystem->session = session = calloc(1, sizeof(struct nvmf_session));

		subsystem->session = session = calloc(1, sizeof(struct spdk_nvmf_session));

		if (session == NULL) {

			SPDK_ERRLOG("Memory allocation failure\n");

			rsp->status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;
@@ -332,7 +332,7 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn, 
void

spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn)

{

	struct nvmf_session *session = conn->sess;

	struct spdk_nvmf_session *session = conn->sess;



	assert(session != NULL);

	session->num_connections--;
@@ -345,25 +345,25 @@ spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn) 
}



static uint64_t

nvmf_prop_get_cap(struct nvmf_session *session)

nvmf_prop_get_cap(struct spdk_nvmf_session *session)

{

	return session->vcprop.cap.raw;

}



static uint64_t

nvmf_prop_get_vs(struct nvmf_session *session)

nvmf_prop_get_vs(struct spdk_nvmf_session *session)

{

	return session->vcprop.vs.raw;

}



static uint64_t

nvmf_prop_get_cc(struct nvmf_session *session)

nvmf_prop_get_cc(struct spdk_nvmf_session *session)

{

	return session->vcprop.cc.raw;

}



static bool

nvmf_prop_set_cc(struct nvmf_session *session, uint64_t value)

nvmf_prop_set_cc(struct spdk_nvmf_session *session, uint64_t value)

{

	union spdk_nvme_cc_register cc, diff;
@@ -432,7 +432,7 @@ nvmf_prop_set_cc(struct nvmf_session *session, uint64_t value) 
}



static uint64_t

nvmf_prop_get_csts(struct nvmf_session *session)

nvmf_prop_get_csts(struct spdk_nvmf_session *session)

{

	return session->vcprop.csts.raw;

}
@@ -441,8 +441,8 @@ struct nvmf_prop { 
	uint32_t ofst;

	uint8_t size;

	char name[11];

	uint64_t (*get_cb)(struct nvmf_session *session);

	bool (*set_cb)(struct nvmf_session *session, uint64_t value);

	uint64_t (*get_cb)(struct spdk_nvmf_session *session);

	bool (*set_cb)(struct spdk_nvmf_session *session, uint64_t value);

};



#define PROP(field, size, get_cb, set_cb) \
@@ -477,7 +477,7 @@ find_prop(uint32_t ofst) 
}



void

spdk_nvmf_property_get(struct nvmf_session *session,

spdk_nvmf_property_get(struct spdk_nvmf_session *session,

		       struct spdk_nvmf_fabric_prop_get_cmd *cmd,

		       struct spdk_nvmf_fabric_prop_get_rsp *response)

{
@@ -515,7 +515,7 @@ spdk_nvmf_property_get(struct nvmf_session *session, 
}



void

spdk_nvmf_property_set(struct nvmf_session *session,

spdk_nvmf_property_set(struct spdk_nvmf_session *session,

		       struct spdk_nvmf_fabric_prop_set_cmd *cmd,

		       struct spdk_nvme_cpl *response)

{
@@ -553,7 +553,7 @@ spdk_nvmf_property_set(struct nvmf_session *session, 
}



int

spdk_nvmf_session_poll(struct nvmf_session *session)

spdk_nvmf_session_poll(struct spdk_nvmf_session *session)

{

	struct spdk_nvmf_conn	*conn, *tmp;

lib/nvmf/session.h

+6 −6
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ enum conn_type { 


struct spdk_nvmf_conn {

	const struct spdk_nvmf_transport	*transport;

	struct nvmf_session			*sess;

	struct spdk_nvmf_session		*sess;

	enum conn_type				type;



	uint16_t				sq_head;
@@ -66,7 +66,7 @@ struct spdk_nvmf_conn { 
 * state. Each NVMf session permits some number of connections.

 * At least one admin connection and additional IOQ connections.

 */

struct nvmf_session {

struct spdk_nvmf_session {

	struct spdk_nvmf_subsystem *subsys;



	struct {
@@ -97,17 +97,17 @@ void 
spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn);



void

spdk_nvmf_property_get(struct nvmf_session *session,

spdk_nvmf_property_get(struct spdk_nvmf_session *session,

		       struct spdk_nvmf_fabric_prop_get_cmd *cmd,

		       struct spdk_nvmf_fabric_prop_get_rsp *response);



void

spdk_nvmf_property_set(struct nvmf_session *session,

spdk_nvmf_property_set(struct spdk_nvmf_session *session,

		       struct spdk_nvmf_fabric_prop_set_cmd *cmd,

		       struct spdk_nvme_cpl *rsp);



int spdk_nvmf_session_poll(struct nvmf_session *session);

int spdk_nvmf_session_poll(struct spdk_nvmf_session *session);



void spdk_nvmf_session_destruct(struct nvmf_session *session);

void spdk_nvmf_session_destruct(struct spdk_nvmf_session *session);



#endif