public inbox for linux-rdma@vger.kernel.org
 help / color / mirror / Atom feed
From: Bart Van Assche <bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
To: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Bart Van Assche <bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
Subject: [PATCH v2 6/8] IB/srp: Remove second argument of srp_destroy_qp()
Date: Wed, 11 Oct 2017 10:27:27 -0700	[thread overview]
Message-ID: <20171011172729.16984-7-bart.vanassche@wdc.com> (raw)
In-Reply-To: <20171011172729.16984-1-bart.vanassche-Sjgp3cTcYWE@public.gmane.org>

This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
Reviewed-by: Sagi Grimberg <sagi-NQWnxTmZq1alnMjI0IkVqw@public.gmane.org>
---
 drivers/infiniband/ulp/srp/ib_srp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 8ceb4bb011f1..96750ad253c4 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -464,20 +464,20 @@ static struct srp_fr_pool *srp_alloc_fr_pool(struct srp_target_port *target)
 
 /**
  * srp_destroy_qp() - destroy an RDMA queue pair
- * @qp: RDMA queue pair.
+ * @ch: SRP RDMA channel.
  *
  * Drain the qp before destroying it.  This avoids that the receive
  * completion handler can access the queue pair while it is
  * being destroyed.
  */
-static void srp_destroy_qp(struct srp_rdma_ch *ch, struct ib_qp *qp)
+static void srp_destroy_qp(struct srp_rdma_ch *ch)
 {
 	spin_lock_irq(&ch->lock);
 	ib_process_cq_direct(ch->send_cq, -1);
 	spin_unlock_irq(&ch->lock);
 
-	ib_drain_qp(qp);
-	ib_destroy_qp(qp);
+	ib_drain_qp(ch->qp);
+	ib_destroy_qp(ch->qp);
 }
 
 static int srp_create_ch_ib(struct srp_rdma_ch *ch)
@@ -550,7 +550,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)
 	}
 
 	if (ch->qp)
-		srp_destroy_qp(ch, ch->qp);
+		srp_destroy_qp(ch);
 	if (ch->recv_cq)
 		ib_free_cq(ch->recv_cq);
 	if (ch->send_cq)
@@ -617,7 +617,7 @@ static void srp_free_ch_ib(struct srp_target_port *target,
 			ib_destroy_fmr_pool(ch->fmr_pool);
 	}
 
-	srp_destroy_qp(ch, ch->qp);
+	srp_destroy_qp(ch);
 	ib_free_cq(ch->send_cq);
 	ib_free_cq(ch->recv_cq);
 
-- 
2.14.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-10-11 17:27 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-11 17:27 [PATCH v2 0/8] SRP patches for kernel v4.15 Bart Van Assche
     [not found] ` <20171011172729.16984-1-bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
2017-10-11 17:27   ` [PATCH v2 1/8] IB/srpt: Do not accept invalid initiator port names Bart Van Assche
2017-10-11 17:27   ` [PATCH v2 2/8] IB/srpt: Limit the send and receive queue sizes to what the HCA supports Bart Van Assche
2017-10-11 17:27   ` [PATCH v2 3/8] IB/srpt: Cache global L_Key Bart Van Assche
2017-10-11 17:27   ` [PATCH v2 4/8] IB/srpt: Change default behavior from using SRQ to using RC Bart Van Assche
     [not found]     ` <20171011172729.16984-5-bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
2017-11-02 18:30       ` Marciniszyn, Mike
     [not found]         ` <32E1700B9017364D9B60AED9960492BC6266931A-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-11-02 21:41           ` Bart Van Assche
     [not found]             ` <1509658914.2484.21.camel-Sjgp3cTcYWE@public.gmane.org>
2017-11-03 13:05               ` Marciniszyn, Mike
2017-11-03 15:46             ` Marciniszyn, Mike
2017-11-03 16:01             ` Marciniszyn, Mike
     [not found]               ` <32E1700B9017364D9B60AED9960492BC6266E41A-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-11-03 16:10                 ` Bart Van Assche
     [not found]                   ` <1509725458.2473.23.camel-Sjgp3cTcYWE@public.gmane.org>
2017-11-03 16:13                     ` Marciniszyn, Mike
2017-11-03 19:53                   ` Marciniszyn, Mike
     [not found]                     ` <32E1700B9017364D9B60AED9960492BC626708EE-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-11-13 19:56                       ` Doug Ledford
2017-10-11 17:27   ` Bart Van Assche [this message]
2017-10-11 17:27   ` [PATCH v2 7/8] IB/srp: Cache global rkey Bart Van Assche
2017-10-11 17:27   ` [PATCH v2 8/8] IB/srp: Make CM timeout dependent on subnet timeout Bart Van Assche
2017-10-18 14:50   ` [PATCH v2 0/8] SRP patches for kernel v4.15 Doug Ledford
2017-10-11 17:27 ` [PATCH v2 5/8] IB/srp: Avoid that a cable pull can trigger a kernel crash Bart Van Assche

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171011172729.16984-7-bart.vanassche@wdc.com \
    --to=bart.vanassche-sjgp3ctcywe@public.gmane.org \
    --cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox