Commit 9c2186ea authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme/rdma: make nvme_rdma_pre_copy_mem() return void 



nvme_rdma_pre_copy_mem() does not have any failure cases, so remove its
return value and remove the never-taken branch in its only caller,
nvme_rdma_qpair_submit_request().

Change-Id: I91011734ed0c20f8db691d62172fe1a3021dd3a1
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 5660dfde

lib/nvme/nvme_rdma.c

+2 −6
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ nvme_rdma_qpair_init(struct nvme_rdma_qpair *rqpair) 
	return 0;

}



static int

static void

nvme_rdma_pre_copy_mem(struct spdk_nvme_rdma_req *rdma_req)

{

	struct spdk_nvme_sgl_descriptor *nvme_sgl;
@@ -229,8 +229,6 @@ nvme_rdma_pre_copy_mem(struct spdk_nvme_rdma_req *rdma_req) 


	nvme_sgl = &rdma_req->cmd.dptr.sgl1;

	nvme_sgl->keyed.key = rdma_req->bb_sgl.lkey;



	return 0;

}



static void
@@ -1270,9 +1268,7 @@ nvme_rdma_qpair_submit_request(struct spdk_nvme_qpair *qpair, 
		return -1;

	}



	if (nvme_rdma_pre_copy_mem(rdma_req) < 0) {

		return -1;

	}

	nvme_rdma_pre_copy_mem(rdma_req);



	memset(&wr, 0, sizeof(wr));

	wr.wr_id = (uint64_t)rdma_req;