On Mon, Jun 06, 2016 at 10:15:06PM +0100, Sudip Mukherjee wrote:
> prot_sg_cnt has been assigned with the value of ret which we have
> already checked to be non-zero so prot_sg_cnt can never be zero at this
> point of the code and hence the else part can never execute.
> And since we know prot_sg_cnt is non zero there is no use for the
> if condition also.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@xxxxxxxxxxxxxxx>
And what about other places?
428 if (prot_sg_cnt)
429 ctx->sig->sig_wr.prot = &ctx->sig->prot.sge;
....
455 if (prot_sg_cnt)
456 ib_mr_pool_put(qp, &qp->rdma_mrs, ctx->sig->prot.mr);
....
> ---
> drivers/infiniband/core/rw.c | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/infiniband/core/rw.c b/drivers/infiniband/core/rw.c
> index 1eb9b12..a829a14 100644
> --- a/drivers/infiniband/core/rw.c
> +++ b/drivers/infiniband/core/rw.c
> @@ -386,21 +386,17 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
> count += ret;
> prev_wr = &ctx->sig->data.reg_wr.wr;
>
> - if (prot_sg_cnt) {
> - ret = rdma_rw_init_one_mr(qp, port_num, &ctx->sig->prot,
> - prot_sg, prot_sg_cnt, 0);
> - if (ret < 0)
> - goto out_destroy_data_mr;
> - count += ret;
> + ret = rdma_rw_init_one_mr(qp, port_num, &ctx->sig->prot,
> + prot_sg, prot_sg_cnt, 0);
> + if (ret < 0)
> + goto out_destroy_data_mr;
> + count += ret;
>
> - if (ctx->sig->prot.inv_wr.next)
> - prev_wr->next = &ctx->sig->prot.inv_wr;
> - else
> - prev_wr->next = &ctx->sig->prot.reg_wr.wr;
> - prev_wr = &ctx->sig->prot.reg_wr.wr;
> - } else {
> - ctx->sig->prot.mr = NULL;
> - }
> + if (ctx->sig->prot.inv_wr.next)
> + prev_wr->next = &ctx->sig->prot.inv_wr;
> + else
> + prev_wr->next = &ctx->sig->prot.reg_wr.wr;
> + prev_wr = &ctx->sig->prot.reg_wr.wr;
>
> ctx->sig->sig_mr = ib_mr_pool_get(qp, &qp->sig_mrs);
> if (!ctx->sig->sig_mr) {
> --
> 1.9.1
>
Attachment:
signature.asc
Description: Digital signature
