Commit 11c994d9 authored Apr 16, 2017 by Linus Torvalds

cgroup

Pull cgroup fix from Tejun Heo:
 "Unfortunately, the commit to fix the cgroup mount race in the previous
  pull request can lead to hangs.

  The original bug has been around for a while and isn't too likely to
  be triggered in usual use cases. Revert the commit for now"

* 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  Revert "cgroup: avoid attaching a cgroup root to two different superblocks"

parents 032aaf3f 330c4186

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))