Commit 02827b67 authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Cleanup rxe_pool_entry 

Currently three different names are used to describe rxe pool elements.
They are referred to as entries, elems or pelems. This patch chooses one
'elem' and changes the other ones.

Link: https://lore.kernel.org/r/20211103050241.61293-3-rpearsonhpe@gmail.com


Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 21adfa7a

drivers/infiniband/sw/rxe/rxe_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -146,9 +146,9 @@ void rxe_cq_disable(struct rxe_cq *cq) 
	spin_unlock_bh(&cq->cq_lock);

}



void rxe_cq_cleanup(struct rxe_pool_entry *arg)

void rxe_cq_cleanup(struct rxe_pool_elem *elem)

{

	struct rxe_cq *cq = container_of(arg, typeof(*cq), pelem);

	struct rxe_cq *cq = container_of(elem, typeof(*cq), elem);



	if (cq->queue)

		rxe_queue_cleanup(cq->queue);

drivers/infiniband/sw/rxe/rxe_loc.h

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int rxe_cq_post(struct rxe_cq *cq, struct rxe_cqe *cqe, int solicited); 


void rxe_cq_disable(struct rxe_cq *cq);



void rxe_cq_cleanup(struct rxe_pool_entry *arg);

void rxe_cq_cleanup(struct rxe_pool_elem *arg);



/* rxe_mcast.c */

int rxe_mcast_get_grp(struct rxe_dev *rxe, union ib_gid *mgid,
@@ -51,7 +51,7 @@ int rxe_mcast_drop_grp_elem(struct rxe_dev *rxe, struct rxe_qp *qp, 


void rxe_drop_all_mcast_groups(struct rxe_qp *qp);



void rxe_mc_cleanup(struct rxe_pool_entry *arg);

void rxe_mc_cleanup(struct rxe_pool_elem *arg);



/* rxe_mmap.c */

struct rxe_mmap_info {
@@ -89,7 +89,7 @@ int rxe_invalidate_mr(struct rxe_qp *qp, u32 rkey); 
int rxe_reg_fast_mr(struct rxe_qp *qp, struct rxe_send_wqe *wqe);

int rxe_mr_set_page(struct ib_mr *ibmr, u64 addr);

int rxe_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata);

void rxe_mr_cleanup(struct rxe_pool_entry *arg);

void rxe_mr_cleanup(struct rxe_pool_elem *arg);



/* rxe_mw.c */

int rxe_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata);
@@ -97,7 +97,7 @@ int rxe_dealloc_mw(struct ib_mw *ibmw); 
int rxe_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe);

int rxe_invalidate_mw(struct rxe_qp *qp, u32 rkey);

struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey);

void rxe_mw_cleanup(struct rxe_pool_entry *arg);

void rxe_mw_cleanup(struct rxe_pool_elem *arg);



/* rxe_net.c */

struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
@@ -131,7 +131,7 @@ void rxe_qp_error(struct rxe_qp *qp); 


void rxe_qp_destroy(struct rxe_qp *qp);



void rxe_qp_cleanup(struct rxe_pool_entry *arg);

void rxe_qp_cleanup(struct rxe_pool_elem *elem);



static inline int qp_num(struct rxe_qp *qp)

{

drivers/infiniband/sw/rxe/rxe_mcast.c

+2 −2
Original line number Diff line number Diff line
@@ -168,9 +168,9 @@ void rxe_drop_all_mcast_groups(struct rxe_qp *qp) 
	}

}



void rxe_mc_cleanup(struct rxe_pool_entry *arg)

void rxe_mc_cleanup(struct rxe_pool_elem *elem)

{

	struct rxe_mc_grp *grp = container_of(arg, typeof(*grp), pelem);

	struct rxe_mc_grp *grp = container_of(elem, typeof(*grp), elem);

	struct rxe_dev *rxe = grp->rxe;



	rxe_drop_key(grp);

drivers/infiniband/sw/rxe/rxe_mr.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ int mr_check_range(struct rxe_mr *mr, u64 iova, size_t length) 


static void rxe_mr_init(int access, struct rxe_mr *mr)

{

	u32 lkey = mr->pelem.index << 8 | rxe_get_next_key(-1);

	u32 lkey = mr->elem.index << 8 | rxe_get_next_key(-1);

	u32 rkey = (access & IB_ACCESS_REMOTE) ? lkey : 0;



	/* set ibmr->l/rkey and also copy into private l/rkey
@@ -699,9 +699,9 @@ int rxe_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) 
	return 0;

}



void rxe_mr_cleanup(struct rxe_pool_entry *arg)

void rxe_mr_cleanup(struct rxe_pool_elem *elem)

{

	struct rxe_mr *mr = container_of(arg, typeof(*mr), pelem);

	struct rxe_mr *mr = container_of(elem, typeof(*mr), elem);



	ib_umem_release(mr->umem);

drivers/infiniband/sw/rxe/rxe_mw.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ int rxe_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata) 
	}



	rxe_add_index(mw);

	mw->rkey = ibmw->rkey = (mw->pelem.index << 8) | rxe_get_next_key(-1);

	mw->rkey = ibmw->rkey = (mw->elem.index << 8) | rxe_get_next_key(-1);

	mw->state = (mw->ibmw.type == IB_MW_TYPE_2) ?

			RXE_MW_STATE_FREE : RXE_MW_STATE_VALID;

	spin_lock_init(&mw->lock);
@@ -330,9 +330,9 @@ struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey) 
	return mw;

}



void rxe_mw_cleanup(struct rxe_pool_entry *elem)

void rxe_mw_cleanup(struct rxe_pool_elem *elem)

{

	struct rxe_mw *mw = container_of(elem, typeof(*mw), pelem);

	struct rxe_mw *mw = container_of(elem, typeof(*mw), elem);



	rxe_drop_index(mw);

}