diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
commit | 0fc24c1ebff281406d66840cbaa6d303bc2cae24 (patch) | |
tree | b3cacbb64fa31671d2f6241f38b5dd31db4a643a /kernel/cgroup.c | |
parent | b9914406fb128bee01b2a23a35eafbc83ff915f0 (diff) | |
parent | 18aa04d882fe72eb59ea2c9e3f78400d85b6535f (diff) |
Merge branch 'rmk-next' into s3c64xx
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 35eebd5510c..358e77564e6 100644 --- a/kernel/cgroup.c +++ b/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); |