Browse Source

IB/srpt: Simplify srpt_queue_response()

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>
Bart Van Assche 9 years ago
parent
commit
10fce586b2
1 changed files with 2 additions and 5 deletions
  1. 2 5
      drivers/infiniband/ulp/srpt/ib_srpt.c

+ 2 - 5
drivers/infiniband/ulp/srpt/ib_srpt.c

@@ -2262,7 +2262,7 @@ static void srpt_queue_response(struct se_cmd *cmd)
 		container_of(cmd, struct srpt_send_ioctx, cmd);
 		container_of(cmd, struct srpt_send_ioctx, cmd);
 	struct srpt_rdma_ch *ch = ioctx->ch;
 	struct srpt_rdma_ch *ch = ioctx->ch;
 	struct srpt_device *sdev = ch->sport->sdev;
 	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;
 	struct ib_sge sge;
 	enum srpt_command_state state;
 	enum srpt_command_state state;
 	unsigned long flags;
 	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];
 			struct srpt_rw_ctx *ctx = &ioctx->rw_ctxs[i];
 
 
 			first_wr = rdma_rw_ctx_wrs(&ctx->rw, ch->qp,
 			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)
 	if (state != SRPT_STATE_MGMT)