From 8b0951107f43cf6d3b0a1f866362dbc2a3fa7505 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 3 Jul 2012 10:38:06 -0700
Subject: [PATCH] --- yaml --- r: 316731 b: refs/heads/master c:
 ce27e317ba22b359bde02216afab934dac3af095 h: refs/heads/master i:   316729:
 653b7b47148ac113972048952d8a46a2ca0d491f   316727:
 34da9f400e9dfd89dc952f320946b4bbf1ee5978 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);