From 9c466a504a7dc505745c1481591db6a2bd2cc49b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 10 Oct 2016 18:09:51 +0000 Subject: [PATCH] ib_srpt: Rework QP failure reporting code git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7000 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/src/ib_srpt.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index e92c6b746..27c8093bd 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -2272,24 +2272,20 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch) if (ch->using_rdma_cm) { ret = rdma_create_qp(ch->rdma_cm.cm_id, sdev->pd, qp_init); ch->qp = ch->rdma_cm.cm_id->qp; - if (ret) - pr_err("failed to create queue pair (%d)\n", ret); } else { ch->qp = ib_create_qp(sdev->pd, qp_init); if (!IS_ERR(ch->qp)) { ret = srpt_init_ch_qp(ch, ch->qp); - if (ret) { - pr_err("srpt_init_ch_qp(%#x) failed (%d)\n", - ch->qp->qp_num, ret); + if (ret) ib_destroy_qp(ch->qp); - } } else { ret = PTR_ERR(ch->qp); - pr_err("failed to create queue pair (%d)\n", ret); } } - if (ret) + if (ret) { + pr_err("failed to create queue pair (%d)\n", ret); goto err_destroy_cq; + } pr_debug("qp_num = %#x\n", ch->qp->qp_num);