mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
IB/ipath: Fix lockdep error upon "ifconfig ibN down"
Signed-off-by: Bryan O'Sullivan <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
This commit is contained in:
parent
7a26c47412
commit
3d27b00457
1 changed files with 7 additions and 5 deletions
|
|
@ -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);
|
||||
unsigned long flags;
|
||||
|
||||
/* 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;
|
||||
}
|
||||
|
||||
spin_lock(&dev->n_ahs_lock);
|
||||
spin_lock_irqsave(&dev->n_ahs_lock, flags);
|
||||
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++;
|
||||
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;
|
||||
|
|
@ -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);
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock(&dev->n_ahs_lock);
|
||||
spin_lock_irqsave(&dev->n_ahs_lock, flags);
|
||||
dev->n_ahs_allocated--;
|
||||
spin_unlock(&dev->n_ahs_lock);
|
||||
spin_unlock_irqrestore(&dev->n_ahs_lock, flags);
|
||||
|
||||
kfree(ah);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue