Commit 015ad2b1 authored by zhenwei pi's avatar zhenwei pi Committed by Christoph Hellwig
Browse files

nvme-rdma: minor cleanup in nvme_rdma_create_cq() 



Before cleanup:
enum ib_poll_context poll_ctx;

if (nvme_rdma_poll_queue(queue)) {
        poll_ctx = IB_POLL_DIRECT;
        queue->ib_cq = ib_alloc_cq(ibdev, queue, queue->cq_size,
                                   comp_vector, poll_ctx);
} else {
        poll_ctx = IB_POLL_SOFTIRQ;
        queue->ib_cq = ib_cq_pool_get(ibdev, queue->cq_size,
                                      comp_vector, poll_ctx);
}

After cleanup:
if (nvme_rdma_poll_queue(queue))
        queue->ib_cq = ib_alloc_cq(ibdev, queue, queue->cq_size,
                                   comp_vector, IB_POLL_DIRECT);
else
        queue->ib_cq = ib_cq_pool_get(ibdev, queue->cq_size,
                                      comp_vector, IB_POLL_SOFTIRQ);

IB_POLL_SOFTIRQ/IB_POLL_SOFTIRQ gets used directly in function, this
seems more accessible.

Signed-off-by: default avatarzhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d4f1d5f7

drivers/nvme/host/rdma.c

+4 −8
Original line number Diff line number Diff line
@@ -464,7 +464,6 @@ static int nvme_rdma_create_cq(struct ib_device *ibdev, 
		struct nvme_rdma_queue *queue)

{

	int ret, comp_vector, idx = nvme_rdma_queue_idx(queue);

	enum ib_poll_context poll_ctx;



	/*

	 * Spread I/O queues completion vectors according their queue index.
@@ -473,15 +472,12 @@ static int nvme_rdma_create_cq(struct ib_device *ibdev, 
	comp_vector = (idx == 0 ? idx : idx - 1) % ibdev->num_comp_vectors;



	/* Polling queues need direct cq polling context */

	if (nvme_rdma_poll_queue(queue)) {

		poll_ctx = IB_POLL_DIRECT;

	if (nvme_rdma_poll_queue(queue))

		queue->ib_cq = ib_alloc_cq(ibdev, queue, queue->cq_size,

					   comp_vector, poll_ctx);

	} else {

		poll_ctx = IB_POLL_SOFTIRQ;

					   comp_vector, IB_POLL_DIRECT);

	else

		queue->ib_cq = ib_cq_pool_get(ibdev, queue->cq_size,

					      comp_vector, poll_ctx);

	}

					      comp_vector, IB_POLL_SOFTIRQ);



	if (IS_ERR(queue->ib_cq)) {

		ret = PTR_ERR(queue->ib_cq);