---

yaml --- r: 311732 b: refs/heads/master c: 5db9a4d h: refs/heads/master v: v3
git-mirror · Jul 7, 2012 · 3d480b0 · 3d480b0
1 parent f2662fd
commit 3d480b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db5b3ca0ecdb2e8fad52a4770e4e320e61c77a6
+refs/heads/master: 5db9a4d99b0157a513944e9a44d29c9cec2e91dc
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -3883,8 +3883,12 @@ static void css_dput_fn(struct work_struct *work)
 {
 	struct cgroup_subsys_state *css =
 		container_of(work, struct cgroup_subsys_state, dput_work);
+	struct dentry *dentry = css->cgroup->dentry;
+	struct super_block *sb = dentry->d_sb;
 
-	dput(css->cgroup->dentry);
+	atomic_inc(&sb->s_active);
+	dput(dentry);
+	deactivate_super(sb);
 }
 
 static void init_cgroup_css(struct cgroup_subsys_state *css,