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

Commit ab67ed8d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Doug Ledford
Browse files

IB: remove the write-only usecnt field from struct ib_mr 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@sandisk.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 7cf9ff64

drivers/infiniband/core/uverbs_cmd.c

+0 −6
Original line number Diff line number Diff line
@@ -993,7 +993,6 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, 
	mr->pd      = pd;

	mr->uobject = uobj;

	atomic_inc(&pd->usecnt);

	atomic_set(&mr->usecnt, 0);



	uobj->object = mr;

	ret = idr_add_uobj(&ib_uverbs_mr_idr, uobj);
@@ -1091,11 +1090,6 @@ ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file, 
		}

	}



	if (atomic_read(&mr->usecnt)) {

		ret = -EBUSY;

		goto put_uobj_pd;

	}



	old_pd = mr->pd;

	ret = mr->device->rereg_user_mr(mr, cmd.flags, cmd.start,

					cmd.length, cmd.hca_va,

drivers/infiniband/core/verbs.c

+1 −7
Original line number Diff line number Diff line
@@ -1345,7 +1345,6 @@ struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags) 
		mr->pd      = pd;

		mr->uobject = NULL;

		atomic_inc(&pd->usecnt);

		atomic_set(&mr->usecnt, 0);

	}



	return mr;
@@ -1354,13 +1353,9 @@ EXPORT_SYMBOL(ib_get_dma_mr); 


int ib_dereg_mr(struct ib_mr *mr)

{

	struct ib_pd *pd;

	struct ib_pd *pd = mr->pd;

	int ret;



	if (atomic_read(&mr->usecnt))

		return -EBUSY;



	pd = mr->pd;

	ret = mr->device->dereg_mr(mr);

	if (!ret)

		atomic_dec(&pd->usecnt);
@@ -1396,7 +1391,6 @@ struct ib_mr *ib_alloc_mr(struct ib_pd *pd, 
		mr->pd      = pd;

		mr->uobject = NULL;

		atomic_inc(&pd->usecnt);

		atomic_set(&mr->usecnt, 0);

	}



	return mr;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+0 −3
Original line number Diff line number Diff line
@@ -458,9 +458,6 @@ static int iwch_dereg_mr(struct ib_mr *ib_mr) 
	u32 mmid;



	PDBG("%s ib_mr %p\n", __func__, ib_mr);

	/* There can be no memory windows */

	if (atomic_read(&ib_mr->usecnt))

		return -EINVAL;



	mhp = to_iwch_mr(ib_mr);

	kfree(mhp->pages);

drivers/infiniband/hw/cxgb4/mem.c

+0 −3
Original line number Diff line number Diff line
@@ -704,9 +704,6 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr) 
	u32 mmid;



	PDBG("%s ib_mr %p\n", __func__, ib_mr);

	/* There can be no memory windows */

	if (atomic_read(&ib_mr->usecnt))

		return -EINVAL;



	mhp = to_c4iw_mr(ib_mr);

	rhp = mhp->rhp;

drivers/staging/rdma/ehca/ehca_mrmw.c

+0 −1
Original line number Diff line number Diff line
@@ -1339,7 +1339,6 @@ int ehca_reg_internal_maxmr( 
	e_mr->ib.ib_mr.pd = &e_pd->ib_pd;

	e_mr->ib.ib_mr.uobject = NULL;

	atomic_inc(&(e_pd->ib_pd.usecnt));

	atomic_set(&(e_mr->ib.ib_mr.usecnt), 0);

	*e_maxmr = e_mr;

	return 0;