diff options
| author | Tejun Heo <tj@kernel.org> | 2012-07-03 10:38:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:22:53 -0700 |
| commit | ffa6a041840728be548e45243ccf37303f68a8e9 (patch) | |
| tree | 27ec8578c68621866e2ba03abdae7f98a7b873cd /kernel/cgroup.c | |
| parent | 05e4b43a37ef048498d4b326d9014923de4d4cd1 (diff) | |
cgroup: cgroup_rm_files() was calling simple_unlink() with the wrong inode
commit ce27e317ba22b359bde02216afab934dac3af095 upstream.
While refactoring cgroup file removal path, 05ef1d7c4a "cgroup:
introduce struct cfent" incorrectly changed the @dir argument of
simple_unlink() to the inode of the file being deleted instead of that
of the containing directory.
The effect of this bug is minor - ctime and mtime of the parent
weren't properly updated on file deletion.
Fix it by using @cgrp->dentry->d_inode instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Acked-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index b303dfc7dce0..15462a01f3e1 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -954,7 +954,7 @@ static int cgroup_rm_file(struct cgroup *cgrp, const struct cftype *cft) dget(d); d_delete(d); - simple_unlink(d->d_inode, d); + simple_unlink(cgrp->dentry->d_inode, d); list_del_init(&cfe->node); dput(d); |