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

nvmf: remove SPDK_NVMF_REQUEST_EXEC_STATUS_RELEASE

Browse Source 
It is no longer used now that AER handling holds the request until it is
triggerred.

Change-Id: I71a75e86f82bc06f677cf26defa701e60b9aa1bd
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-03-01 11:00:50 -07:00
parent 776facc69b
commit 7f448daaa3
4 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/nvmf/rdma.c
View File

@ -521,11 +521,8 @@ nvmf_post_rdma_send(struct spdk_nvmf_request *req)
* 3) Upon getting acknowledgement of the completion, decrement the internal * 3) Upon getting acknowledgement of the completion, decrement the internal
* count of number of outstanding requests. (spdk_nvmf_rdma_request_ack_completion) * count of number of outstanding requests. (spdk_nvmf_rdma_request_ack_completion)
* *
* There are two public interfaces to initiate the process of completing a request, * The public interface to initiate the process of completing a request is
* exposed as callbacks in the transport layer. * spdk_nvmf_rdma_request_complete(), which calls a a callback in the transport layer.
*
* 1) spdk_nvmf_rdma_request_complete, which attempts to do all three steps.
* 2) spdk_nvmf_rdma_request_release, which skips straight to step 3.
**/ **/
static int static int
@ -1383,12 +1380,6 @@ spdk_nvmf_rdma_request_complete(struct spdk_nvmf_request *req)
return rc; return rc;
} }
static int
spdk_nvmf_rdma_request_release(struct spdk_nvmf_request *req)
{
return spdk_nvmf_rdma_request_ack_completion(req);
}
static void static void
spdk_nvmf_rdma_close_conn(struct spdk_nvmf_conn *conn) spdk_nvmf_rdma_close_conn(struct spdk_nvmf_conn *conn)
{ {
@ -1561,7 +1552,6 @@ const struct spdk_nvmf_transport spdk_nvmf_transport_rdma = {
.session_remove_conn = spdk_nvmf_rdma_session_remove_conn, .session_remove_conn = spdk_nvmf_rdma_session_remove_conn,
.req_complete = spdk_nvmf_rdma_request_complete, .req_complete = spdk_nvmf_rdma_request_complete,
.req_release = spdk_nvmf_rdma_request_release,
.conn_fini = spdk_nvmf_rdma_close_conn, .conn_fini = spdk_nvmf_rdma_close_conn,
.conn_poll = spdk_nvmf_rdma_poll, .conn_poll = spdk_nvmf_rdma_poll,

7
lib/nvmf/request.c
View File

@ -373,13 +373,6 @@ spdk_nvmf_request_exec(struct spdk_nvmf_request *req)
switch (status) { switch (status) {
case SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE: case SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE:
return spdk_nvmf_request_complete(req); return spdk_nvmf_request_complete(req);
case SPDK_NVMF_REQUEST_EXEC_STATUS_RELEASE:
if (req->conn->transport->req_release(req)) {
SPDK_ERRLOG("Transport request release error!\n");
return -1;
}
return 0;
case SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS: case SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS:
return 0; return 0;
default: default:

1
lib/nvmf/request.h
View File

@ -39,7 +39,6 @@
typedef enum _spdk_nvmf_request_exec_status { typedef enum _spdk_nvmf_request_exec_status {
SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE, SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE,
SPDK_NVMF_REQUEST_EXEC_STATUS_RELEASE,
SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS, SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS,
} spdk_nvmf_request_exec_status; } spdk_nvmf_request_exec_status;

10
lib/nvmf/transport.h
View File

@ -102,18 +102,10 @@ struct spdk_nvmf_transport {
/* /*
* Signal request completion, which sends a response * Signal request completion, which sends a response
* to the originator. A request can either * to the originator.
* be completed or released, but not both.
*/ */
int (*req_complete)(struct spdk_nvmf_request *req); int (*req_complete)(struct spdk_nvmf_request *req);
/*
* Signal that the request can be released without sending
* a response. A request can either be completed or release,
* but not both.
*/
int (*req_release)(struct spdk_nvmf_request *req);
/* /*
* Deinitialize a connection. * Deinitialize a connection.
*/ */