RDMA/ib_srpt: Unify checking rdma_cm_id condition in srpt_cm_req_recv()
authorLi Zhijian <lizhijian@fujitsu.com>
Mon, 1 Aug 2022 06:43:46 +0000 (06:43 +0000)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 2 Aug 2022 18:10:55 +0000 (15:10 -0300)
Although rdma_cm_id and ib_cm_id passing to srpt_cm_req_recv() are
exclusive currently, all other checking condition are using rdma_cm_id.
So unify the 'if' condition to make the code more clear.

Link: https://lore.kernel.org/r/1659336226-2-1-git-send-email-lizhijian@fujitsu.com
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/ulp/srpt/ib_srpt.c

index c3036ae..21cbe30 100644 (file)
@@ -2218,13 +2218,13 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
        ch->zw_cqe.done = srpt_zerolength_write_done;
        INIT_WORK(&ch->release_work, srpt_release_channel_work);
        ch->sport = sport;
-       if (ib_cm_id) {
-               ch->ib_cm.cm_id = ib_cm_id;
-               ib_cm_id->context = ch;
-       } else {
+       if (rdma_cm_id) {
                ch->using_rdma_cm = true;
                ch->rdma_cm.cm_id = rdma_cm_id;
                rdma_cm_id->context = ch;
+       } else {
+               ch->ib_cm.cm_id = ib_cm_id;
+               ib_cm_id->context = ch;
        }
        /*
         * ch->rq_size should be at least as large as the initiator queue