redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Bryan O'Sullivan 2006-09-28 09:00:24 -07:00 committed by Roland Dreier
parent 7a26c47412
commit 3d27b00457
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/infiniband/hw/ipath/ipath_verbs.c
View file

@ -1202,6 +1202,7 @@ static struct ib_ah *ipath_create_ah(struct ib_pd *pd,
struct ipath_ah *ah; struct ipath_ah *ah;
struct ib_ah *ret; struct ib_ah *ret;
struct ipath_ibdev *dev = to_idev(pd->device); struct ipath_ibdev *dev = to_idev(pd->device);
unsigned long flags;
/* A multicast address requires a GRH (see ch. 8.4.1). */ /* A multicast address requires a GRH (see ch. 8.4.1). */
if (ah_attr->dlid >= IPATH_MULTICAST_LID_BASE && 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); kfree(ah);
ret = ERR_PTR(-ENOMEM); ret = ERR_PTR(-ENOMEM);
goto bail; goto bail;
} }
dev->n_ahs_allocated++; 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. */ /* ib_create_ah() will initialize ah->ibah. */
ah->attr = *ah_attr; 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_ibdev *dev = to_idev(ibah->device);
struct ipath_ah *ah = to_iah(ibah); 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);