summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2016-06-17 18:24:27 +0200
committerTejun Heo <tj@kernel.org>2016-06-17 20:16:32 +0200
commitd6ccc55e66ccdbc8ad0eeda14419f8eaccbc246b (patch)
tree07dddac3f4c19e16865f5c7cf2a306407ca96564 /kernel
parentcgroup: fix idr leak for the first cgroup root (diff)
downloadlinux-d6ccc55e66ccdbc8ad0eeda14419f8eaccbc246b.tar.xz
linux-d6ccc55e66ccdbc8ad0eeda14419f8eaccbc246b.zip
cgroup: remove unnecessary 0 check from css_from_id()
css_idr allocation starts at 1, so index 0 will never point to an item. css_from_id() currently filters that before asking idr_find(), but idr_find() would also just return NULL, so this is not needed. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 36fc0ff506c3..78f6d18ff0af 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -6162,7 +6162,7 @@ struct cgroup_subsys_state *css_tryget_online_from_dir(struct dentry *dentry,
struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss)
{
WARN_ON_ONCE(!rcu_read_lock_held());
- return id > 0 ? idr_find(&ss->css_idr, id) : NULL;
+ return idr_find(&ss->css_idr, id);
}
/**