Commit b0b59a35 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

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



Purpose: To make the function definition style consistent

Change-Id: I7ade943881aa5076fdd419958e386ae3c3661da6
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
parent 2e9cd2cd

lib/nvmf/request.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ nvmf_process_property_get(struct spdk_nvmf_request *req) 
	cmd = &req->cmd->prop_get_cmd;

	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;

}
@@ -143,7 +143,7 @@ nvmf_process_property_set(struct spdk_nvmf_request *req) 


	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;

}

lib/nvmf/session.c

+6 −6
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ find_prop(uint32_t ofst) 
}



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_rsp *response)

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



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_nvme_cpl *response)

{

lib/nvmf/session.h

+6 −6
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ void 
spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn);



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_rsp *response);



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_nvme_cpl *rsp);

test/lib/nvmf/nvmf/nvmf_ut.c

+7 −7
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ nvmf_test_process_admin_cmd(void) 


#define RUN_AND_CHECK_PROPERTY_RESULT(fsts, cmd_cid) \

	do { \

		nvmf_property_get(sess, &cmd, &response); \

		spdk_nvmf_property_get(sess, &cmd, &response); \

		CU_ASSERT_EQUAL(response.status.sc, fsts); \

	} while (0)
@@ -792,7 +792,7 @@ nvmf_test_property_get(void) 
	cmd.ofst = 0xffff;

	cmd.attrib = 0;

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

}
@@ -815,7 +815,7 @@ nvmf_test_property_set(void) 
		BUILD_PROPERTY_CMD(property_name, attr, c_id); \

		property_name = (union union_name *)&cmd.value.u32.low; \

		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(sess->vcprop.property_name.bits.bits_attr, val); \

	} while (0)
@@ -827,7 +827,7 @@ nvmf_test_property_set(void) 
	cmd.attrib = 0;

	cmd.cid = 34;

	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(sess->vcprop.nssr, nssr);
@@ -837,7 +837,7 @@ nvmf_test_property_set(void) 
		BUILD_PROPERTY_CMD(property_name, attr, c_id); \

		property_name = (union union_name *)&cmd.value.u32.low; \

		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_NOT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \

	} while (0)
@@ -850,14 +850,14 @@ nvmf_test_property_set(void) 
	cmd.attrib = 1;

	cmd.cid = 37;

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



	cmd.ofst = 0xffff;

	cmd.attrib = 0;

	cmd.value.u32.low = 20;

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

}

test/lib/nvmf/request/request_ut.c

+6 −6
Original line number Diff line number Diff line
@@ -116,14 +116,14 @@ spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn) 
}



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_rsp *response)

{

}



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_nvme_cpl *rsp)

{