From 11a2f1cf47539f25176ee86e73ee46ea99786271 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 28 Nov 2016 14:28:40 -0700 Subject: [PATCH] nvme/rdma: simplify nvme_rdma_req_get() nvme_rdma_req_get() is an internal function, and its only caller already checks for a valid rqpair, so the NULL check is unnecessary. Also clean up the redundant STAILQ_EMPTY/STAILQ_FIRST logic and use STAILQ_REMOVE_HEAD. Change-Id: Ic3828e8b5e881879173cb59350e39c5fac90e6ef Signed-off-by: Daniel Verkamp --- lib/nvme/nvme_rdma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index 298fdf112..0b0ab5f87 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -144,12 +144,10 @@ nvme_rdma_req_get(struct nvme_rdma_qpair *rqpair) { struct spdk_nvme_rdma_req *rdma_req; - if (!rqpair || STAILQ_EMPTY(&rqpair->free_reqs)) { - return NULL; - } - rdma_req = STAILQ_FIRST(&rqpair->free_reqs); - STAILQ_REMOVE(&rqpair->free_reqs, rdma_req, spdk_nvme_rdma_req, link); + if (rdma_req) { + STAILQ_REMOVE_HEAD(&rqpair->free_reqs, link); + } return rdma_req; }