[kernel] r16282 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Wed Sep 15 10:22:14 2010
New Revision: 16282

Log:
cgroupfs: create /sys/fs/cgroup to mount cgroupfs on (Closes: #595964)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
   dists/sid/linux-2.6/debian/patches/series/23
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Sep 14 12:18:21 2010	(r16281)
+++ dists/sid/linux-2.6/debian/changelog	Wed Sep 15 10:22:14 2010	(r16282)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-23) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * cgroupfs: create /sys/fs/cgroup to mount cgroupfs on (Closes: #595964)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 15 Sep 2010 11:21:18 +0100
+
 linux-2.6 (2.6.32-22) unstable; urgency=low
 
   [ Ian Campbell ]

Added: dists/sid/linux-2.6/debian/patches/features/all/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch	Wed Sep 15 10:22:14 2010	(r16282)
@@ -0,0 +1,59 @@
+From: Greg KH <gregkh at suse.de>
+Date: Thu, 5 Aug 2010 13:53:35 -0700
+Subject: [PATCH] cgroupfs: create /sys/fs/cgroup to mount cgroupfs on
+
+commit 676db4af043014e852f67ba0349dae0071bd11f3 upstream.
+
+We really shouldn't be asking userspace to create new root filesystems.
+So follow along with all of the other in-kernel filesystems, and provide
+a mount point in sysfs.
+
+For cgroupfs, this should be in /sys/fs/cgroup/  This change provides
+that mount point when the cgroup filesystem is registered in the kernel.
+
+Acked-by: Paul Menage <menage at google.com>
+Acked-by: Dhaval Giani <dhaval.giani at gmail.com>
+Cc: Li Zefan <lizf at cn.fujitsu.com>
+Cc: Lennart Poettering <lennart at poettering.net>
+Cc: Kay Sievers <kay.sievers at vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ kernel/cgroup.c |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index a8ce099..d83cab0 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -1623,6 +1623,8 @@ static struct file_system_type cgroup_fs_type = {
+ 	.kill_sb = cgroup_kill_sb,
+ };
+ 
++static struct kobject *cgroup_kobj;
++
+ static inline struct cgroup *__d_cgrp(struct dentry *dentry)
+ {
+ 	return dentry->d_fsdata;
+@@ -3894,9 +3896,18 @@ int __init cgroup_init(void)
+ 	hhead = css_set_hash(init_css_set.subsys);
+ 	hlist_add_head(&init_css_set.hlist, hhead);
+ 	BUG_ON(!init_root_id(&rootnode));
++
++	cgroup_kobj = kobject_create_and_add("cgroup", fs_kobj);
++	if (!cgroup_kobj) {
++		err = -ENOMEM;
++		goto out;
++	}
++
+ 	err = register_filesystem(&cgroup_fs_type);
+-	if (err < 0)
++	if (err < 0) {
++		kobject_put(cgroup_kobj);
+ 		goto out;
++	}
+ 
+ 	proc_create("cgroups", 0, NULL, &proc_cgroupstats_operations);
+ 
+-- 
+1.7.1
+

Added: dists/sid/linux-2.6/debian/patches/series/23
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/23	Wed Sep 15 10:22:14 2010	(r16282)
@@ -0,0 +1 @@
++ features/all/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch