Commit 2b787d48 authored by Ziye Yang's avatar Ziye Yang Committed by Changpeng Liu
Browse files

nvmf/rdma: remove the duplicated code in spdk_nvmf_rdma_request_free 



The purpose of this patch is to remove the duplicated code
used in spdk_nvmf_rdma_request_free

Change-Id: I3f74466a7ec788000eff9c2a75c9ea2cacaf5cc2
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/c/439942


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a9c30bcc

lib/nvmf/rdma.c

+21 −26
Original line number Diff line number Diff line
@@ -1336,6 +1336,25 @@ spdk_nvmf_rdma_request_parse_sgl(struct spdk_nvmf_rdma_transport *rtransport, 
	return -1;

}



static void

nvmf_rdma_request_free(struct spdk_nvmf_rdma_request *rdma_req,

		       struct spdk_nvmf_rdma_transport	*rtransport)

{

	if (rdma_req->data_from_pool) {

		/* Put the buffer/s back in the pool */

		for (uint32_t i = 0; i < rdma_req->req.iovcnt; i++) {

			spdk_mempool_put(rtransport->data_buf_pool, rdma_req->data.buffers[i]);

			rdma_req->req.iov[i].iov_base = NULL;

			rdma_req->data.buffers[i] = NULL;

		}

		rdma_req->data_from_pool = false;

	}

	rdma_req->req.length = 0;

	rdma_req->req.iovcnt = 0;

	rdma_req->req.data = NULL;

	spdk_nvmf_rdma_request_set_state(rdma_req, RDMA_REQUEST_STATE_FREE);

}



static bool

spdk_nvmf_rdma_request_process(struct spdk_nvmf_rdma_transport *rtransport,

			       struct spdk_nvmf_rdma_request *rdma_req)
@@ -1534,19 +1553,7 @@ spdk_nvmf_rdma_request_process(struct spdk_nvmf_rdma_transport *rtransport, 
			spdk_trace_record(TRACE_RDMA_REQUEST_STATE_COMPLETED, 0, 0,

					  (uintptr_t)rdma_req, (uintptr_t)rqpair->cm_id);



			if (rdma_req->data_from_pool) {

				/* Put the buffer/s back in the pool */

				for (uint32_t i = 0; i < rdma_req->req.iovcnt; i++) {

					spdk_mempool_put(rtransport->data_buf_pool, rdma_req->data.buffers[i]);

					rdma_req->req.iov[i].iov_base = NULL;

					rdma_req->data.buffers[i] = NULL;

				}

				rdma_req->data_from_pool = false;

			}

			rdma_req->req.length = 0;

			rdma_req->req.iovcnt = 0;

			rdma_req->req.data = NULL;

			spdk_nvmf_rdma_request_set_state(rdma_req, RDMA_REQUEST_STATE_FREE);

			nvmf_rdma_request_free(rdma_req, rtransport);

			break;

		case RDMA_REQUEST_NUM_STATES:

		default:
@@ -2494,19 +2501,7 @@ spdk_nvmf_rdma_request_free(struct spdk_nvmf_request *req) 
	struct spdk_nvmf_rdma_transport	*rtransport = SPDK_CONTAINEROF(req->qpair->transport,

			struct spdk_nvmf_rdma_transport, transport);



	if (rdma_req->data_from_pool) {

		/* Put the buffer/s back in the pool */

		for (uint32_t i = 0; i < rdma_req->req.iovcnt; i++) {

			spdk_mempool_put(rtransport->data_buf_pool, rdma_req->data.buffers[i]);

			rdma_req->req.iov[i].iov_base = NULL;

			rdma_req->data.buffers[i] = NULL;

		}

		rdma_req->data_from_pool = false;

	}

	rdma_req->req.length = 0;

	rdma_req->req.iovcnt = 0;

	rdma_req->req.data = NULL;

	spdk_nvmf_rdma_request_set_state(rdma_req, RDMA_REQUEST_STATE_FREE);

	nvmf_rdma_request_free(rdma_req, rtransport);

	return 0;

}