cgroup_idr_remove() can be invoked from bh leading to lockdep
detecting possible AA deadlock (IN_BH/ON_BH). Make the lock bh-safe.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
kernel/cgroup.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 95fc66b..e2ff925 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -203,9 +203,9 @@ static int cgroup_idr_alloc(struct idr *idr, void *ptr, int start, int end,
int ret;
idr_preload(gfp_mask);
- spin_lock(&cgroup_idr_lock);
+ spin_lock_bh(&cgroup_idr_lock);
ret = idr_alloc(idr, ptr, start, end, gfp_mask);
- spin_unlock(&cgroup_idr_lock);
+ spin_unlock_bh(&cgroup_idr_lock);
idr_preload_end();
return ret;
}
@@ -214,17 +214,17 @@ static void *cgroup_idr_replace(struct idr *idr, void *ptr, int id)
{
void *ret;
- spin_lock(&cgroup_idr_lock);
+ spin_lock_bh(&cgroup_idr_lock);
ret = idr_replace(idr, ptr, id);
- spin_unlock(&cgroup_idr_lock);
+ spin_unlock_bh(&cgroup_idr_lock);
return ret;
}
static void cgroup_idr_remove(struct idr *idr, int id)
{
- spin_lock(&cgroup_idr_lock);
+ spin_lock_bh(&cgroup_idr_lock);
idr_remove(idr, id);
- spin_unlock(&cgroup_idr_lock);
+ spin_unlock_bh(&cgroup_idr_lock);
}
/**
--
1.9.0
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
