Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/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"
+1
-1
+1
-1
kernel/cgroup/cgroup-v1.c
+1
-1
kernel/cgroup/cgroup-v1.c
···
1146
1146
* path is super cold. Let's just sleep a bit and retry.
1147
1147
*/
1148
1148
pinned_sb = kernfs_pin_sb(root->kf_root, NULL);
1149
-
if (IS_ERR_OR_NULL(pinned_sb) ||
1149
+
if (IS_ERR(pinned_sb) ||
1150
1150
!percpu_ref_tryget_live(&root->cgrp.self.refcnt)) {
1151
1151
mutex_unlock(&cgroup_mutex);
1152
1152
if (!IS_ERR_OR_NULL(pinned_sb))