Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1201017

[PATCH cgroup/for-4.3 1/3] cgroup: replace error handling in cgroup_init() with WARN_ON()s

Show all headers | View raw

The init sequence shouldn't fail short of bugs and even when it does
it's better to continue with the rest of initialization and we were
silently ignoring /proc/cgroups creation failure.

Drop the explicit error handling and wrap sysfs_create_mount_point(),
register_filesystem() and proc_create() with WARN_ON()s.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
---
 kernel/cgroup.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5014,7 +5014,7 @@ int __init cgroup_init(void)
 {
 	struct cgroup_subsys *ss;
 	unsigned long key;
-	int ssid, err;
+	int ssid;
 
 	BUG_ON(percpu_init_rwsem(&cgroup_threadgroup_rwsem));
 	BUG_ON(cgroup_init_cftypes(NULL, cgroup_dfl_base_files));
@@ -5072,17 +5072,10 @@ int __init cgroup_init(void)
 			ss->bind(init_css_set.subsys[ssid]);
 	}
 
-	err = sysfs_create_mount_point(fs_kobj, "cgroup");
-	if (err)
-		return err;
-
-	err = register_filesystem(&cgroup_fs_type);
-	if (err < 0) {
-		sysfs_remove_mount_point(fs_kobj, "cgroup");
-		return err;
-	}
+	WARN_ON(sysfs_create_mount_point(fs_kobj, "cgroup"));
+	WARN_ON(register_filesystem(&cgroup_fs_type));
+	WARN_ON(!proc_create("cgroups", 0, NULL, &proc_cgroupstats_operations));
 
-	proc_create("cgroups", 0, NULL, &proc_cgroupstats_operations);
 	return 0;
 }
 
--
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/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH cgroup/for-4.3 1/3] cgroup: replace error handling in  cgroup_init() with WARN_ON()s Tejun Heo <tj@kernel.org> - 2015-08-05 19:30 +0200
  [PATCH cgroup/for-4.3 3/3] cgroup: replace __DEVEL__sane_behavior  with cgroup2 fs type Tejun Heo <tj@kernel.org> - 2015-08-05 19:30 +0200
    Re: [PATCH cgroup/for-4.3 3/3] cgroup: replace __DEVEL__sane_behavior  with cgroup2 fs type Zefan Li <lizefan@huawei.com> - 2015-08-10 12:30 +0200
  Re: [PATCH cgroup/for-4.3 2/3] cgroup: drop  cgroup__DEVEL__legacy_files_on_dfl Tejun Heo <tj@kernel.org> - 2015-08-05 19:30 +0200
  Re: [PATCH cgroup/for-4.3 1/3] cgroup: replace error handling in  cgroup_init() with WARN_ON()s Zefan Li <lizefan@huawei.com> - 2015-08-10 12:30 +0200

csiph-web