diff options
| author | Tejun Heo <tj@kernel.org> | 2013-11-29 10:42:58 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-11-29 10:42:58 -0500 |
| commit | b9f3cecaba592d4e98cd155c91b1414323ed51e8 (patch) | |
| tree | ac2371d8169482c4d738a84ca337f42221255025 | |
| parent | ac1e69aa78e2e799a8d5475595ba744bdf29b597 (diff) | |
cgroup: remove cftype->release()
Now that pidlist files don't use cftype->release(), it doesn't have
any user left. Remove it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
| -rw-r--r-- | include/linux/cgroup.h | 2 | ||||
| -rw-r--r-- | kernel/cgroup.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 492fa01ec2d3..5207c28c2402 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
| @@ -499,8 +499,6 @@ struct cftype { | |||
| 499 | * kick type for multiplexing. | 499 | * kick type for multiplexing. |
| 500 | */ | 500 | */ |
| 501 | int (*trigger)(struct cgroup_subsys_state *css, unsigned int event); | 501 | int (*trigger)(struct cgroup_subsys_state *css, unsigned int event); |
| 502 | |||
| 503 | int (*release)(struct inode *inode, struct file *file); | ||
| 504 | }; | 502 | }; |
| 505 | 503 | ||
| 506 | /* | 504 | /* |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 1e09ded0387a..b59e3453eae7 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -2448,12 +2448,9 @@ static int cgroup_file_open(struct inode *inode, struct file *file) | |||
| 2448 | static int cgroup_file_release(struct inode *inode, struct file *file) | 2448 | static int cgroup_file_release(struct inode *inode, struct file *file) |
| 2449 | { | 2449 | { |
| 2450 | struct cfent *cfe = __d_cfe(file->f_dentry); | 2450 | struct cfent *cfe = __d_cfe(file->f_dentry); |
| 2451 | struct cftype *cft = __d_cft(file->f_dentry); | ||
| 2452 | struct cgroup_subsys_state *css = cfe->css; | 2451 | struct cgroup_subsys_state *css = cfe->css; |
| 2453 | int ret = 0; | 2452 | int ret = 0; |
| 2454 | 2453 | ||
| 2455 | if (cft->release) | ||
| 2456 | ret = cft->release(inode, file); | ||
| 2457 | if (css->ss) | 2454 | if (css->ss) |
| 2458 | css_put(css); | 2455 | css_put(css); |
| 2459 | if (file->f_op == &cgroup_seqfile_operations) | 2456 | if (file->f_op == &cgroup_seqfile_operations) |
