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

Commit f3e93c77 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: Count SRQs properly 



Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent aa4eaed7

drivers/infiniband/hw/ipath/ipath_srq.c

+15 −8
Original line number Diff line number Diff line
@@ -104,11 +104,6 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd, 
	u32 sz;

	struct ib_srq *ret;



	if (dev->n_srqs_allocated == ib_ipath_max_srqs) {

		ret = ERR_PTR(-ENOMEM);

		goto done;

	}



	if (srq_init_attr->attr.max_wr == 0) {

		ret = ERR_PTR(-EINVAL);

		goto done;
@@ -180,10 +175,17 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd, 
	spin_lock_init(&srq->rq.lock);

	srq->rq.wq->head = 0;

	srq->rq.wq->tail = 0;

	srq->rq.max_sge = srq_init_attr->attr.max_sge;

	srq->limit = srq_init_attr->attr.srq_limit;



	spin_lock(&dev->n_srqs_lock);

	if (dev->n_srqs_allocated == ib_ipath_max_srqs) {

		spin_unlock(&dev->n_srqs_lock);

		ret = ERR_PTR(-ENOMEM);

		goto bail_wq;

	}



 	dev->n_srqs_allocated++;

	spin_unlock(&dev->n_srqs_lock);



	ret = &srq->ibsrq;

	goto done;
@@ -351,7 +353,12 @@ int ipath_destroy_srq(struct ib_srq *ibsrq) 
	struct ipath_srq *srq = to_isrq(ibsrq);

	struct ipath_ibdev *dev = to_idev(ibsrq->device);



	spin_lock(&dev->n_srqs_lock);

	dev->n_srqs_allocated--;

	spin_unlock(&dev->n_srqs_lock);

	if (srq->ip)

		kref_put(&srq->ip->ref, ipath_release_mmap_info);

	else

		vfree(srq->rq.wq);

	kfree(srq);