diff options
| -rw-r--r-- | kernel/cgroup.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e5583d10a325..0e0b20b8c5db 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -802,7 +802,6 @@ static struct cgroup *task_cgroup_from_root(struct task_struct *task, | |||
| 802 | */ | 802 | */ |
| 803 | 803 | ||
| 804 | static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode); | 804 | static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode); |
| 805 | static struct dentry *cgroup_lookup(struct inode *, struct dentry *, unsigned int); | ||
| 806 | static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry); | 805 | static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry); |
| 807 | static int cgroup_populate_dir(struct cgroup *cgrp, bool base_files, | 806 | static int cgroup_populate_dir(struct cgroup *cgrp, bool base_files, |
| 808 | unsigned long subsys_mask); | 807 | unsigned long subsys_mask); |
| @@ -2642,7 +2641,7 @@ static const struct inode_operations cgroup_file_inode_operations = { | |||
| 2642 | }; | 2641 | }; |
| 2643 | 2642 | ||
| 2644 | static const struct inode_operations cgroup_dir_inode_operations = { | 2643 | static const struct inode_operations cgroup_dir_inode_operations = { |
| 2645 | .lookup = cgroup_lookup, | 2644 | .lookup = simple_lookup, |
| 2646 | .mkdir = cgroup_mkdir, | 2645 | .mkdir = cgroup_mkdir, |
| 2647 | .rmdir = cgroup_rmdir, | 2646 | .rmdir = cgroup_rmdir, |
| 2648 | .rename = cgroup_rename, | 2647 | .rename = cgroup_rename, |
| @@ -2652,14 +2651,6 @@ static const struct inode_operations cgroup_dir_inode_operations = { | |||
| 2652 | .removexattr = cgroup_removexattr, | 2651 | .removexattr = cgroup_removexattr, |
| 2653 | }; | 2652 | }; |
| 2654 | 2653 | ||
| 2655 | static struct dentry *cgroup_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) | ||
| 2656 | { | ||
| 2657 | if (dentry->d_name.len > NAME_MAX) | ||
| 2658 | return ERR_PTR(-ENAMETOOLONG); | ||
| 2659 | d_add(dentry, NULL); | ||
| 2660 | return NULL; | ||
| 2661 | } | ||
| 2662 | |||
| 2663 | /* | 2654 | /* |
| 2664 | * Check if a file is a control file | 2655 | * Check if a file is a control file |
| 2665 | */ | 2656 | */ |
