From 61750faf07b2fd3d9c234bad3c7ab03dc606978c Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 6 Nov 2008 12:53:32 -0800
Subject: [PATCH] --- yaml --- r: 118438 b: refs/heads/master c:
 24eb089950ce44603b30a3145a2c8520e2b55bb1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7c3ca0002c84..f7edb1d9a8c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b41ad14c30acf023d09ac064096a4cf41248ce46
+refs/heads/master: 24eb089950ce44603b30a3145a2c8520e2b55bb1
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 35eebd5510c2..358e77564e6f 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -2497,7 +2497,6 @@ static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry)
 	list_del(&cgrp->sibling);
 	spin_lock(&cgrp->dentry->d_lock);
 	d = dget(cgrp->dentry);
-	cgrp->dentry = NULL;
 	spin_unlock(&d->d_lock);
 
 	cgroup_d_remove_dir(d);