diff --git a/[refs] b/[refs] index 14ce663e26c7..965055233eeb 100644 --- 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 index 5f134a0e0e3f..b303dfc7dce0 100644 --- 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,