From 93b89c1ffe4690e75c7ae1b5a5cfb44e55aea867 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 2 May 2012 09:14:47 +0300 Subject: [PATCH] --- yaml --- r: 302629 b: refs/heads/master c: d19081e044356ae6464e939aef04514c5e227b5a h: refs/heads/master i: 302627: ec0178c4c4c8f99369625896235470e26c2f443d v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c6b392ec87bf..4d08febb225d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55a8d62a3bd2a0536d526da817fd4f49e6470770 +refs/heads/master: d19081e044356ae6464e939aef04514c5e227b5a diff --git a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 0d1872faa6ab..e9f74d1b48f6 100644 --- a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -1431,7 +1431,7 @@ int ocrdma_destroy_qp(struct ib_qp *ibqp) struct ocrdma_dev *dev; struct ib_qp_attr attrs; int attr_mask = IB_QP_STATE; - unsigned long wq_flags = 0, rq_flags = 0; + unsigned long flags; qp = get_ocrdma_qp(ibqp); dev = qp->dev; @@ -1453,15 +1453,15 @@ int ocrdma_destroy_qp(struct ib_qp *ibqp) * acquire CQ lock while destroy is in progress, in order to * protect against proessing in-flight CQEs for this QP. */ - spin_lock_irqsave(&qp->sq_cq->cq_lock, wq_flags); + spin_lock_irqsave(&qp->sq_cq->cq_lock, flags); if (qp->rq_cq && (qp->rq_cq != qp->sq_cq)) - spin_lock_irqsave(&qp->rq_cq->cq_lock, rq_flags); + spin_lock(&qp->rq_cq->cq_lock); ocrdma_del_qpn_map(dev, qp); if (qp->rq_cq && (qp->rq_cq != qp->sq_cq)) - spin_unlock_irqrestore(&qp->rq_cq->cq_lock, rq_flags); - spin_unlock_irqrestore(&qp->sq_cq->cq_lock, wq_flags); + spin_unlock(&qp->rq_cq->cq_lock); + spin_unlock_irqrestore(&qp->sq_cq->cq_lock, flags); if (!pd->uctx) { ocrdma_discard_cqes(qp, qp->sq_cq);