---

yaml --- r: 316731 b: refs/heads/master c: ce27e31 h: refs/heads/master i: 316729: 653b7b4 316727: 34da9f4 v: v3
git-mirror · Jul 9, 2012 · 8b09511 · 8b09511
1 parent db7d8c1
commit 8b09511
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);