Skip to content

Commit 330c418

Browse files
htejunhtejun
committed
Revert "cgroup: avoid attaching a cgroup root to two different superblocks"
This reverts commit bfb0b80. Andrei reports CRIU test hangs with the patch applied. The bug fixed by the patch isn't too likely to trigger in actual uses. Revert the patch for now. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Andrei Vagin <avagin@virtuozzo.com> Link: http://lkml.kernel.org/r/20170414232737.GC20350@outlook.office365.com
1 parent bfb0b80 commit 330c418

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎kernel/cgroup/cgroup-v1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ struct dentry *cgroup1_mount(struct file_system_type *fs_type, int flags,
11461146
* path is super cold. Let's just sleep a bit and retry.
11471147
*/
11481148
pinned_sb = kernfs_pin_sb(root->kf_root, NULL);
1149-
if (IS_ERR_OR_NULL(pinned_sb) ||
1149+
if (IS_ERR(pinned_sb) ||
11501150
!percpu_ref_tryget_live(&root->cgrp.self.refcnt)) {
11511151
mutex_unlock(&cgroup_mutex);
11521152
if (!IS_ERR_OR_NULL(pinned_sb))

0 commit comments

Comments
 (0)