summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-22 18:20:44 -0500
committerTejun Heo <tj@kernel.org>2013-11-22 18:20:44 -0500
commitb36824c75c7855585d6476eef2b234f6e0e68872 (patch)
treec966d0ff0a2f82bd0fb8296d65292e852bc6a77c /kernel
parent3bc942f372af383f49d56aab599469561a5e39ec (diff)
downloadblackbird-op-linux-b36824c75c7855585d6476eef2b234f6e0e68872.tar.gz
blackbird-op-linux-b36824c75c7855585d6476eef2b234f6e0e68872.zip
cgroup: unexport cgroup_css() and remove __file_cft()
Now that cgroup_event is made memcg specific, the temporarily exported functions are no longer necessary. Unexport cgroup_css() and remove __file_cft() which doesn't have any user left. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index feda7c54fa6b..c0248e16461d 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -202,8 +202,8 @@ static int cgroup_addrm_files(struct cgroup *cgrp, struct cftype cfts[],
* keep accessing it outside the said locks. This function may return
* %NULL if @cgrp doesn't have @subsys_id enabled.
*/
-struct cgroup_subsys_state *cgroup_css(struct cgroup *cgrp,
- struct cgroup_subsys *ss)
+static struct cgroup_subsys_state *cgroup_css(struct cgroup *cgrp,
+ struct cgroup_subsys *ss)
{
if (ss)
return rcu_dereference_check(cgrp->subsys[ss->subsys_id],
@@ -2625,16 +2625,6 @@ static const struct inode_operations cgroup_dir_inode_operations = {
.removexattr = cgroup_removexattr,
};
-/*
- * Check if a file is a control file
- */
-struct cftype *__file_cft(struct file *file)
-{
- if (file_inode(file)->i_fop != &cgroup_file_operations)
- return ERR_PTR(-EINVAL);
- return __d_cft(file->f_dentry);
-}
-
static int cgroup_create_file(struct dentry *dentry, umode_t mode,
struct super_block *sb)
{
OpenPOWER on IntegriCloud