Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757466Ab2JaM3k (ORCPT ); Wed, 31 Oct 2012 08:29:40 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:21951 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757251Ab2JaM32 (ORCPT ); Wed, 31 Oct 2012 08:29:28 -0400 From: Glauber Costa To: Cc: Tejun Heo , , , Peter Zijlstra , Glauber Costa , Michal Hocko , Li Zefan Subject: [PATCH 2/2] allow post_create to fail Date: Wed, 31 Oct 2012 16:29:14 +0400 Message-Id: <1351686554-22592-3-git-send-email-glommer@parallels.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351686554-22592-1-git-send-email-glommer@parallels.com> References: <1351686554-22592-1-git-send-email-glommer@parallels.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2842 Lines: 91 Initialization in post_create can theoretically fail (although it won't in cpuset). The comment in cgroup.c even seem to indicate that the possibility of failure was the intention. It is not terribly complicated, so let us just allow it to fail. Signed-off-by: Glauber Costa CC: Tejun Heo CC: Michal Hocko CC: Li Zefan --- include/linux/cgroup.h | 2 +- kernel/cgroup.c | 7 +++++-- kernel/cpuset.c | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 7f422ba..34cb906 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -477,7 +477,7 @@ struct cgroup_subsys { void (*fork)(struct task_struct *task); void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp, struct task_struct *task); - void (*post_create)(struct cgroup *cgrp); + int (*post_create)(struct cgroup *cgrp); void (*bind)(struct cgroup *root); int subsys_id; diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 40caab1..20a1422 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3963,8 +3963,11 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry, goto err_destroy; } /* At error, ->destroy() callback has to free assigned ID. */ - if (ss->post_create) - ss->post_create(cgrp); + if (ss->post_create) { + err = ss->post_create(cgrp); + if (err) + goto err_destroy; + } if (ss->broken_hierarchy && !ss->warned_broken_hierarchy && parent->parent) { diff --git a/kernel/cpuset.c b/kernel/cpuset.c index ca97af8..e7623ae 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1799,19 +1799,19 @@ static struct cftype files[] = { * (and likewise for mems) to the new cgroup. Called with cgroup_mutex * held. */ -static void cpuset_post_create(struct cgroup *cgroup) +static int cpuset_post_create(struct cgroup *cgroup) { struct cgroup *parent, *child; struct cpuset *cs, *parent_cs; if (!clone_children(cgroup)) - return; + return 0; parent = cgroup->parent; list_for_each_entry(child, &parent->children, sibling) { cs = cgroup_cs(child); if (is_mem_exclusive(cs) || is_cpu_exclusive(cs)) - return; + return 0; } cs = cgroup_cs(cgroup); parent_cs = cgroup_cs(parent); @@ -1820,7 +1820,7 @@ static void cpuset_post_create(struct cgroup *cgroup) cs->mems_allowed = parent_cs->mems_allowed; cpumask_copy(cs->cpus_allowed, parent_cs->cpus_allowed); mutex_unlock(&callback_mutex); - return; + return 0; } /* -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/