[PATCH 1/2] cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static

[PATCH 1/2] cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static

[Kirill A. Shutemov]

From: "Kirill A. Shutemov" <kirill@shutemov.name>

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 kernel/cgroup.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 4936d88..98990dd 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -938,7 +938,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
  *
  * CGRP_WAIT_ON_RMDIR flag is set under cgroup's inode->i_mutex;
  */
-DECLARE_WAIT_QUEUE_HEAD(cgroup_rmdir_waitq);
+static DECLARE_WAIT_QUEUE_HEAD(cgroup_rmdir_waitq);
 
 static void cgroup_wakeup_rmdir_waiter(struct cgroup *cgrp)
 {
@@ -2070,7 +2070,7 @@ static int css_set_prefetch(struct cgroup *cgrp, struct css_set *cg,
  * Call holding cgroup_mutex and the group_rwsem of the leader. Will take
  * task_lock of each thread in leader's threadgroup individually in turn.
  */
-int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+static int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 {
 	int retval, i, group_size, nr_migrating_tasks;
 	struct cgroup_subsys *ss, *failed_ss = NULL;
-- 
1.7.7.3

[PATCH 2/2] cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()

[Kirill A. Shutemov]

From: "Kirill A. Shutemov" <kirill@shutemov.name>

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 kernel/cgroup.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 98990dd..cbbc61d 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2854,6 +2854,7 @@ static void cgroup_enable_task_cg_lists(void)
 }
 
 void cgroup_iter_start(struct cgroup *cgrp, struct cgroup_iter *it)
+	__acquires(css_set_lock)
 {
 	/*
 	 * The first time anyone tries to iterate across a cgroup,
@@ -2893,6 +2894,7 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
 }
 
 void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it)
+	__releases(css_set_lock)
 {
 	read_unlock(&css_set_lock);
 }
-- 
1.7.7.3

Re: [PATCH 1/2] cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static

[Li Zefan]

Kirill A. Shutemov wrote:
> From: "Kirill A. Shutemov" <kirill@shutemov.name>
> 
> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>

Acked-by: Li Zefan <lizf@cn.fujitsu.com>

Re: [PATCH 2/2] cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()

[Li Zefan]

Kirill A. Shutemov wrote:
> From: "Kirill A. Shutemov" <kirill@shutemov.name>
> 
> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>

Acked-by: Li Zefan <lizf@cn.fujitsu.com>

Re: [PATCH 2/2] cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()

[Tejun Heo]

On Tue, Dec 27, 2011 at 07:46:26AM +0200, Kirill A. Shutemov wrote:
> From: "Kirill A. Shutemov" <kirill@shutemov.name>
> 
> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>

Applied 1-2 to cgroup/for-3.3.  Thank you.

-- 
tejun