lkml.org 
[lkml]   [2009]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] cgroups: fix lockdep subclasses overflow
From
On Wed, Feb 4, 2009 at 1:11 AM, Li Zefan <lizf@cn.fujitsu.com> wrote:
>
> This patch uses different lockdep keys for different subsystems.
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

Acked-by: Paul Menage <menage@google.com>

Looks good, thanks.

Paul

> ---
> include/linux/cgroup.h | 1 +
> kernel/cgroup.c | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
> index e4e8e11..499900d 100644
> --- a/include/linux/cgroup.h
> +++ b/include/linux/cgroup.h
> @@ -378,6 +378,7 @@ struct cgroup_subsys {
> * - initiating hotplug events
> */
> struct mutex hierarchy_mutex;
> + struct lock_class_key subsys_key;
>
> /*
> * Link to parent, and list entry in parent's children.
> diff --git a/kernel/cgroup.c b/kernel/cgroup.c
> index 5a54ff4..e14db9c 100644
> --- a/kernel/cgroup.c
> +++ b/kernel/cgroup.c
> @@ -2351,7 +2351,7 @@ static void cgroup_lock_hierarchy(struct cgroupfs_root *root)
> for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
> struct cgroup_subsys *ss = subsys[i];
> if (ss->root == root)
> - mutex_lock_nested(&ss->hierarchy_mutex, i);
> + mutex_lock(&ss->hierarchy_mutex);
> }
> }
>
> @@ -2637,6 +2637,7 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss)
> BUG_ON(!list_empty(&init_task.tasks));
>
> mutex_init(&ss->hierarchy_mutex);
> + lockdep_set_class(&ss->hierarchy_mutex, &ss->subsys_key);
> ss->active = 1;
> }
>
> --
> 1.5.4.rc3
>
>
>
>


\
 
 \ /
  Last update: 2009-02-04 16:51    [W:0.044 / U:0.916 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site