IB/ipath: Fix lockdep error upon "ifconfig ibN down"

Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 56c0193..42eaed8 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1202,6 +1202,7 @@ static struct ib_ah *ipath_create_ah(struct ib_pd *pd,
        struct ipath_ah *ah;
        struct ib_ah *ret;
        struct ipath_ibdev *dev = to_idev(pd->device);
        struct ipath_ah *ah;
        struct ib_ah *ret;
        struct ipath_ibdev *dev = to_idev(pd->device);

+       unsigned long flags;

 
        /* A multicast address requires a GRH (see ch. 8.4.1). */
        if (ah_attr->dlid >= IPATH_MULTICAST_LID_BASE &&
 
        /* A multicast address requires a GRH (see ch. 8.4.1). */
        if (ah_attr->dlid >= IPATH_MULTICAST_LID_BASE &&


@@ -1228,16 +1229,16 @@ static struct ib_ah *ipath_create_ah(struct ib_pd *pd,
                goto bail;
        }
 
                goto bail;
        }
 

-       spin_lock(&dev->n_ahs_lock);
+       spin_lock_irqsave(&dev->n_ahs_lock, flags);

        if (dev->n_ahs_allocated == ib_ipath_max_ahs) {
        if (dev->n_ahs_allocated == ib_ipath_max_ahs) {

-               spin_unlock(&dev->n_ahs_lock);
+               spin_unlock_irqrestore(&dev->n_ahs_lock, flags);

                kfree(ah);
                ret = ERR_PTR(-ENOMEM);
                goto bail;
        }
 
        dev->n_ahs_allocated++;
                kfree(ah);
                ret = ERR_PTR(-ENOMEM);
                goto bail;
        }
 
        dev->n_ahs_allocated++;

-       spin_unlock(&dev->n_ahs_lock);
+       spin_unlock_irqrestore(&dev->n_ahs_lock, flags);

 
        /* ib_create_ah() will initialize ah->ibah. */
        ah->attr = *ah_attr;
 
        /* ib_create_ah() will initialize ah->ibah. */
        ah->attr = *ah_attr;


@@ -1258,10 +1259,11 @@ static int ipath_destroy_ah(struct ib_ah *ibah)
 {
        struct ipath_ibdev *dev = to_idev(ibah->device);
        struct ipath_ah *ah = to_iah(ibah);
 {
        struct ipath_ibdev *dev = to_idev(ibah->device);
        struct ipath_ah *ah = to_iah(ibah);

+       unsigned long flags;

 
 

-       spin_lock(&dev->n_ahs_lock);
+       spin_lock_irqsave(&dev->n_ahs_lock, flags);

        dev->n_ahs_allocated--;
        dev->n_ahs_allocated--;

-       spin_unlock(&dev->n_ahs_lock);
+       spin_unlock_irqrestore(&dev->n_ahs_lock, flags);

 
        kfree(ah);
 
 
        kfree(ah);