cgroup: cgroup_rm_files() was calling simple_unlink() with the wrong inode
authorTejun Heo <tj@kernel.org>
Tue, 3 Jul 2012 17:38:06 +0000 (10:38 -0700)
committerTejun Heo <tj@kernel.org>
Mon, 9 Jul 2012 17:11:14 +0000 (10:11 -0700)
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>
Cc: stable@vger.kernel.org
kernel/cgroup.c

index dec62f5936efc3cd5532d21d29d3f1ae1dc9309d..a56805aa0f1b97c4332e40a66a888ba019ec8b4d 100644 (file)
@@ -959,7 +959,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);