IB/srpt: Simplify srpt_queue_response()
authorBart Van Assche <bart.vanassche@sandisk.com>
Thu, 21 Jul 2016 20:04:06 +0000 (13:04 -0700)
committerDoug Ledford <dledford@redhat.com>
Tue, 2 Aug 2016 16:02:41 +0000 (12:02 -0400)
Initialize first_wr to &send_wr. This allows to remove a ternary
operator and an else branch. This patch does not change the behavior
of srpt_queue_response().

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Tested-by: Laurence Oberman <loberman@redhat.com>
Cc: Parav Pandit <pandit.parav@gmail.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/ulp/srpt/ib_srpt.c

index 9a3b954e862d0a1e792881284994dcac749574df..dfa23b075a88469b73c3f199f73c8b8ed571187f 100644 (file)
@@ -2262,7 +2262,7 @@ static void srpt_queue_response(struct se_cmd *cmd)
                container_of(cmd, struct srpt_send_ioctx, cmd);
        struct srpt_rdma_ch *ch = ioctx->ch;
        struct srpt_device *sdev = ch->sport->sdev;
-       struct ib_send_wr send_wr, *first_wr = NULL, *bad_wr;
+       struct ib_send_wr send_wr, *first_wr = &send_wr, *bad_wr;
        struct ib_sge sge;
        enum srpt_command_state state;
        unsigned long flags;
@@ -2303,11 +2303,8 @@ static void srpt_queue_response(struct se_cmd *cmd)
                        struct srpt_rw_ctx *ctx = &ioctx->rw_ctxs[i];
 
                        first_wr = rdma_rw_ctx_wrs(&ctx->rw, ch->qp,
-                                       ch->sport->port, NULL,
-                                       first_wr ? first_wr : &send_wr);
+                                       ch->sport->port, NULL, first_wr);
                }
-       } else {
-               first_wr = &send_wr;
        }
 
        if (state != SRPT_STATE_MGMT)