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

NVMf: add spdk prefix for two funcs defined in session.h

Browse Source 
Purpose: To make the function definition style consistent

Change-Id: I7ade943881aa5076fdd419958e386ae3c3661da6
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2016-09-23 10:05:45 +08:00 committed by Jim Harris
parent 2e9cd2cd77
commit b0b59a356f
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nvmf/request.c
View File

@ -131,7 +131,7 @@ nvmf_process_property_get(struct spdk_nvmf_request *req)
cmd = &req->cmd->prop_get_cmd; cmd = &req->cmd->prop_get_cmd;
response = &req->rsp->prop_get_rsp; response = &req->rsp->prop_get_rsp;
nvmf_property_get(req->conn->sess, cmd, response); spdk_nvmf_property_get(req->conn->sess, cmd, response);
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }
@ -143,7 +143,7 @@ nvmf_process_property_set(struct spdk_nvmf_request *req)
cmd = &req->cmd->prop_set_cmd; cmd = &req->cmd->prop_set_cmd;
nvmf_property_set(req->conn->sess, cmd, &req->rsp->nvme_cpl); spdk_nvmf_property_set(req->conn->sess, cmd, &req->rsp->nvme_cpl);
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }

12
lib/nvmf/session.c
View File

@ -477,9 +477,9 @@ find_prop(uint32_t ofst)
} }
void void
nvmf_property_get(struct nvmf_session *session, spdk_nvmf_property_get(struct nvmf_session *session,
struct spdk_nvmf_fabric_prop_get_cmd *cmd, struct spdk_nvmf_fabric_prop_get_cmd *cmd,
struct spdk_nvmf_fabric_prop_get_rsp *response) struct spdk_nvmf_fabric_prop_get_rsp *response)
{ {
const struct nvmf_prop *prop; const struct nvmf_prop *prop;
@ -515,9 +515,9 @@ nvmf_property_get(struct nvmf_session *session,
} }
void void
nvmf_property_set(struct nvmf_session *session, spdk_nvmf_property_set(struct nvmf_session *session,
struct spdk_nvmf_fabric_prop_set_cmd *cmd, struct spdk_nvmf_fabric_prop_set_cmd *cmd,
struct spdk_nvme_cpl *response) struct spdk_nvme_cpl *response)
{ {
const struct nvmf_prop *prop; const struct nvmf_prop *prop;
uint64_t value; uint64_t value;

12
lib/nvmf/session.h
View File

@ -97,14 +97,14 @@ void
spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn); spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn);
void void
nvmf_property_get(struct nvmf_session *session, spdk_nvmf_property_get(struct nvmf_session *session,
struct spdk_nvmf_fabric_prop_get_cmd *cmd, struct spdk_nvmf_fabric_prop_get_cmd *cmd,
struct spdk_nvmf_fabric_prop_get_rsp *response); struct spdk_nvmf_fabric_prop_get_rsp *response);
void void
nvmf_property_set(struct nvmf_session *session, spdk_nvmf_property_set(struct nvmf_session *session,
struct spdk_nvmf_fabric_prop_set_cmd *cmd, struct spdk_nvmf_fabric_prop_set_cmd *cmd,
struct spdk_nvme_cpl *rsp); struct spdk_nvme_cpl *rsp);
int spdk_nvmf_session_poll(struct nvmf_session *session); int spdk_nvmf_session_poll(struct nvmf_session *session);

14
test/lib/nvmf/nvmf/nvmf_ut.c
View File

@ -704,7 +704,7 @@ nvmf_test_process_admin_cmd(void)
#define RUN_AND_CHECK_PROPERTY_RESULT(fsts, cmd_cid) \ #define RUN_AND_CHECK_PROPERTY_RESULT(fsts, cmd_cid) \
do { \ do { \
nvmf_property_get(sess, &cmd, &response); \ spdk_nvmf_property_get(sess, &cmd, &response); \
CU_ASSERT_EQUAL(response.status.sc, fsts); \ CU_ASSERT_EQUAL(response.status.sc, fsts); \
} while (0) } while (0)
@ -792,7 +792,7 @@ nvmf_test_property_get(void)
cmd.ofst = 0xffff; cmd.ofst = 0xffff;
cmd.attrib = 0; cmd.attrib = 0;
cmd.cid = 29; cmd.cid = 29;
nvmf_property_get(sess, &cmd, &response); spdk_nvmf_property_get(sess, &cmd, &response);
CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM); CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM);
} }
@ -815,7 +815,7 @@ nvmf_test_property_set(void)
BUILD_PROPERTY_CMD(property_name, attr, c_id); \ BUILD_PROPERTY_CMD(property_name, attr, c_id); \
property_name = (union union_name *)&cmd.value.u32.low; \ property_name = (union union_name *)&cmd.value.u32.low; \
property_name->bits.bits_attr = val; \ property_name->bits.bits_attr = val; \
nvmf_property_set(sess, &cmd, &response, &shutdown); \ spdk_nvmf_property_set(sess, &cmd, &response, &shutdown); \
CU_ASSERT_EQUAL(response.status.sc, 0); \ CU_ASSERT_EQUAL(response.status.sc, 0); \
CU_ASSERT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \ CU_ASSERT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \
} while (0) } while (0)
@ -827,7 +827,7 @@ nvmf_test_property_set(void)
cmd.attrib = 0; cmd.attrib = 0;
cmd.cid = 34; cmd.cid = 34;
cmd.value.u32.low = nssr; cmd.value.u32.low = nssr;
nvmf_property_set(sess, &cmd, &response, &shutdown); spdk_nvmf_property_set(sess, &cmd, &response, &shutdown);
CU_ASSERT_EQUAL(response.status.sc, 0); CU_ASSERT_EQUAL(response.status.sc, 0);
CU_ASSERT_EQUAL(sess->vcprop.nssr, nssr); CU_ASSERT_EQUAL(sess->vcprop.nssr, nssr);
@ -837,7 +837,7 @@ nvmf_test_property_set(void)
BUILD_PROPERTY_CMD(property_name, attr, c_id); \ BUILD_PROPERTY_CMD(property_name, attr, c_id); \
property_name = (union union_name *)&cmd.value.u32.low; \ property_name = (union union_name *)&cmd.value.u32.low; \
property_name->bits.bits_attr = val; \ property_name->bits.bits_attr = val; \
nvmf_property_set(sess, &cmd, &response, &shutdown); \ spdk_nvmf_property_set(sess, &cmd, &response, &shutdown); \
CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM); \ CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM); \
CU_ASSERT_NOT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \ CU_ASSERT_NOT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \
} while (0) } while (0)
@ -850,14 +850,14 @@ nvmf_test_property_set(void)
cmd.attrib = 1; cmd.attrib = 1;
cmd.cid = 37; cmd.cid = 37;
cmd.value.u32.low = nssr; cmd.value.u32.low = nssr;
nvmf_property_set(sess, &cmd, &response, &shutdown); spdk_nvmf_property_set(sess, &cmd, &response, &shutdown);
CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM); CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM);
cmd.ofst = 0xffff; cmd.ofst = 0xffff;
cmd.attrib = 0; cmd.attrib = 0;
cmd.value.u32.low = 20; cmd.value.u32.low = 20;
cmd.cid = 35; cmd.cid = 35;
nvmf_property_set(sess, &cmd, &response, &shutdown); spdk_nvmf_property_set(sess, &cmd, &response, &shutdown);
CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM); CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM);
} }

12
test/lib/nvmf/request/request_ut.c
View File

@ -116,16 +116,16 @@ spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn)
} }
void void
nvmf_property_get(struct nvmf_session *session, spdk_nvmf_property_get(struct nvmf_session *session,
struct spdk_nvmf_fabric_prop_get_cmd *cmd, struct spdk_nvmf_fabric_prop_get_cmd *cmd,
struct spdk_nvmf_fabric_prop_get_rsp *response) struct spdk_nvmf_fabric_prop_get_rsp *response)
{ {
} }
void void
nvmf_property_set(struct nvmf_session *session, spdk_nvmf_property_set(struct nvmf_session *session,
struct spdk_nvmf_fabric_prop_set_cmd *cmd, struct spdk_nvmf_fabric_prop_set_cmd *cmd,
struct spdk_nvme_cpl *rsp) struct spdk_nvme_cpl *rsp)
{ {
} }