diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-16 14:48:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-16 14:48:10 -0400 |
| commit | 11c994d9a50b6ba5a96a1c1450ce0fa7bd840f1c (patch) | |
| tree | 33f5a45684872ea1ba4a23ad3d2eccb0f771687c /kernel | |
| parent | 032aaf3f9ff9faa039673d95ea95e02ddff3a26b (diff) | |
| parent | 330c418638612d7658b6314e6a244fcb5f7efac5 (diff) | |
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"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup/cgroup-v1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index 12e19f0636ea..1dc22f6b49f5 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c | |||
| @@ -1146,7 +1146,7 @@ struct dentry *cgroup1_mount(struct file_system_type *fs_type, int flags, | |||
| 1146 | * path is super cold. Let's just sleep a bit and retry. | 1146 | * path is super cold. Let's just sleep a bit and retry. |
| 1147 | */ | 1147 | */ |
| 1148 | pinned_sb = kernfs_pin_sb(root->kf_root, NULL); | 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 | !percpu_ref_tryget_live(&root->cgrp.self.refcnt)) { | 1150 | !percpu_ref_tryget_live(&root->cgrp.self.refcnt)) { |
| 1151 | mutex_unlock(&cgroup_mutex); | 1151 | mutex_unlock(&cgroup_mutex); |
| 1152 | if (!IS_ERR_OR_NULL(pinned_sb)) | 1152 | if (!IS_ERR_OR_NULL(pinned_sb)) |