Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 330c4186 authored by Tejun Heo's avatar Tejun Heo
Browse files

Revert "cgroup: avoid attaching a cgroup root to two different superblocks" 



This reverts commit bfb0b80d.

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: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarAndrei Vagin <avagin@virtuozzo.com>
Link: http://lkml.kernel.org/r/20170414232737.GC20350@outlook.office365.com
parent bfb0b80d

kernel/cgroup/cgroup-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ struct dentry *cgroup1_mount(struct file_system_type *fs_type, int flags, 
		 * path is super cold.  Let's just sleep a bit and retry.

		 */

		pinned_sb = kernfs_pin_sb(root->kf_root, NULL);

		if (IS_ERR_OR_NULL(pinned_sb) ||

		if (IS_ERR(pinned_sb) ||

		    !percpu_ref_tryget_live(&root->cgrp.self.refcnt)) {

			mutex_unlock(&cgroup_mutex);

			if (!IS_ERR_OR_NULL(pinned_sb))