RDMA/rtrs: Replace duplicate check with is_pollqueue helper
authorJack Wang <jinpu.wang@ionos.com>
Wed, 22 Sep 2021 12:53:30 +0000 (14:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:54 +0000 (14:23 +0200)
[ Upstream commit 36332ded46b6292296bc7170fada6e238a0802cc ]

if (con->cid >= con->sess->irq_con_num) check can be replaced with a
is_pollqueue helper.

Link: https://lore.kernel.org/r/20210922125333.351454-5-haris.iqbal@ionos.com
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/ulp/rtrs/rtrs.c

index 9bc3234..ac83cd9 100644 (file)
@@ -222,13 +222,18 @@ static void qp_event_handler(struct ib_event *ev, void *ctx)
        }
 }
 
+static bool is_pollqueue(struct rtrs_con *con)
+{
+       return con->cid >= con->sess->irq_con_num;
+}
+
 static int create_cq(struct rtrs_con *con, int cq_vector, int nr_cqe,
                     enum ib_poll_context poll_ctx)
 {
        struct rdma_cm_id *cm_id = con->cm_id;
        struct ib_cq *cq;
 
-       if (con->cid >= con->sess->irq_con_num)
+       if (is_pollqueue(con))
                cq = ib_alloc_cq(cm_id->device, con, nr_cqe, cq_vector,
                                 poll_ctx);
        else
@@ -288,7 +293,7 @@ int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con,
        err = create_qp(con, sess->dev->ib_pd, max_send_wr, max_recv_wr,
                        max_send_sge);
        if (err) {
-               if (con->cid >= con->sess->irq_con_num)
+               if (is_pollqueue(con))
                        ib_free_cq(con->cq);
                else
                        ib_cq_pool_put(con->cq, con->nr_cqe);
@@ -308,7 +313,7 @@ void rtrs_cq_qp_destroy(struct rtrs_con *con)
                con->qp = NULL;
        }
        if (con->cq) {
-               if (con->cid >= con->sess->irq_con_num)
+               if (is_pollqueue(con))
                        ib_free_cq(con->cq);
                else
                        ib_cq_pool_put(con->cq, con->nr_cqe);