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