diff --git a/[refs] b/[refs] index 499b03b54411..8d407179e7d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 496f1314f9cac3b59016b5af71ddf47e7a4eb2fb +refs/heads/master: ce27e317ba22b359bde02216afab934dac3af095 diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index dec62f5936ef..a56805aa0f1b 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -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);