xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cgroup: remove redundant check in cgroup_ino()

Browse Source 
After we implemented default unified hierarchy, cgrp->kn can never
be NULL.

Signed-off-by: Zefan Li <lizefan@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Zefan Li
2014-09-19 16:29:31 +08:00
committed by Tejun Heo
parent 52de4779f2
commit f29374b146
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/cgroup.h
View File

@@ -532,13 +532,10 @@ static inline bool cgroup_has_tasks(struct cgroup *cgrp)
return !list_empty(&cgrp->cset_links); return !list_empty(&cgrp->cset_links);
} }
/* returns ino associated with a cgroup, 0 indicates unmounted root */ /* returns ino associated with a cgroup */
static inline ino_t cgroup_ino(struct cgroup *cgrp) static inline ino_t cgroup_ino(struct cgroup *cgrp)
{ {
if (cgrp->kn) return cgrp->kn->ino;
return cgrp->kn->ino;
else
return 0;
} }
/* cft/css accessors for cftype->write() operation */ /* cft/css accessors for cftype->write() operation */

2
mm/memory-failure.c
View File

@@ -148,7 +148,7 @@ static int hwpoison_filter_task(struct page *p)
ino = cgroup_ino(css->cgroup); ino = cgroup_ino(css->cgroup);
css_put(css); css_put(css);
if (!ino || ino != hwpoison_filter_memcg) if (ino != hwpoison_filter_memcg)
return -EINVAL; return -EINVAL;
return 0; return 0;