Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36523159 authored by Dasaratharaman Chandramouli's avatar Dasaratharaman Chandramouli Committed by Doug Ledford
Browse files

IB/core: Rename ib_destroy_ah to rdma_destroy_ah 



Rename ib_destroy_ah to rdma_destroy_ah so its in sync with the
rename of the ib address handle attribute

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDon Hiatt <don.hiatt@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-by: default avatarNiranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bfbfd661

drivers/infiniband/core/agent.c

+2 −2
Original line number Diff line number Diff line
@@ -137,13 +137,13 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh * 
err2:

	ib_free_send_mad(send_buf);

err1:

	ib_destroy_ah(ah);

	rdma_destroy_ah(ah);

}



static void agent_send_handler(struct ib_mad_agent *mad_agent,

			       struct ib_mad_send_wc *mad_send_wc)

{

	ib_destroy_ah(mad_send_wc->send_buf->ah);

	rdma_destroy_ah(mad_send_wc->send_buf->ah);

	ib_free_send_mad(mad_send_wc->send_buf);

}

drivers/infiniband/core/cm.c

+3 −3
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv, 
			       GFP_ATOMIC,

			       IB_MGMT_BASE_VERSION);

	if (IS_ERR(m)) {

		ib_destroy_ah(ah);

		rdma_destroy_ah(ah);

		ret = PTR_ERR(m);

		goto out;

	}
@@ -390,7 +390,7 @@ static int cm_alloc_response_msg(struct cm_port *port, 
			       GFP_ATOMIC,

			       IB_MGMT_BASE_VERSION);

	if (IS_ERR(m)) {

		ib_destroy_ah(ah);

		rdma_destroy_ah(ah);

		return PTR_ERR(m);

	}

	m->ah = ah;
@@ -400,7 +400,7 @@ static int cm_alloc_response_msg(struct cm_port *port, 


static void cm_free_msg(struct ib_mad_send_buf *msg)

{

	ib_destroy_ah(msg->ah);

	rdma_destroy_ah(msg->ah);

	if (msg->context[0])

		cm_deref_id(msg->context[0]);

	ib_free_send_mad(msg);

drivers/infiniband/core/mad_rmpp.c

+5 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void destroy_rmpp_recv(struct mad_rmpp_recv *rmpp_recv) 
{

	deref_rmpp_recv(rmpp_recv);

	wait_for_completion(&rmpp_recv->comp);

	ib_destroy_ah(rmpp_recv->ah);

	rdma_destroy_ah(rmpp_recv->ah);

	kfree(rmpp_recv);

}
@@ -171,7 +171,7 @@ static struct ib_mad_send_buf *alloc_response_msg(struct ib_mad_agent *agent, 
				 hdr_len, 0, GFP_KERNEL,

				 IB_MGMT_BASE_VERSION);

	if (IS_ERR(msg))

		ib_destroy_ah(ah);

		rdma_destroy_ah(ah);

	else {

		msg->ah = ah;

		msg->context[0] = ah;
@@ -201,7 +201,7 @@ static void ack_ds_ack(struct ib_mad_agent_private *agent, 


	ret = ib_post_send_mad(msg, NULL);

	if (ret) {

		ib_destroy_ah(msg->ah);

		rdma_destroy_ah(msg->ah);

		ib_free_send_mad(msg);

	}

}
@@ -209,7 +209,7 @@ static void ack_ds_ack(struct ib_mad_agent_private *agent, 
void ib_rmpp_send_handler(struct ib_mad_send_wc *mad_send_wc)

{

	if (mad_send_wc->send_buf->context[0] == mad_send_wc->send_buf->ah)

		ib_destroy_ah(mad_send_wc->send_buf->ah);

		rdma_destroy_ah(mad_send_wc->send_buf->ah);

	ib_free_send_mad(mad_send_wc->send_buf);

}
@@ -237,7 +237,7 @@ static void nack_recv(struct ib_mad_agent_private *agent, 


	ret = ib_post_send_mad(msg, NULL);

	if (ret) {

		ib_destroy_ah(msg->ah);

		rdma_destroy_ah(msg->ah);

		ib_free_send_mad(msg);

	}

}

drivers/infiniband/core/sa_query.c

+1 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ static void free_sm_ah(struct kref *kref) 
{

	struct ib_sa_sm_ah *sm_ah = container_of(kref, struct ib_sa_sm_ah, ref);



	ib_destroy_ah(sm_ah->ah);

	rdma_destroy_ah(sm_ah->ah);

	kfree(sm_ah);

}

drivers/infiniband/core/user_mad.c

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void send_handler(struct ib_mad_agent *agent, 
	struct ib_umad_packet *packet = send_wc->send_buf->context[0];



	dequeue_send(file, packet);

	ib_destroy_ah(packet->msg->ah);

	rdma_destroy_ah(packet->msg->ah);

	ib_free_send_mad(packet->msg);



	if (send_wc->status == IB_WC_RESP_TIMEOUT_ERR) {
@@ -596,7 +596,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, 
err_msg:

	ib_free_send_mad(packet->msg);

err_ah:

	ib_destroy_ah(ah);

	rdma_destroy_ah(ah);

err_up:

	mutex_unlock(&file->mutex);

err: