diff options
| author | Anay Wadhera <anay1018@gmail.com> | 2021-05-23 18:55:08 +0000 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2022-04-19 00:51:42 +0300 |
| commit | 21abfd815324f445863693fb76c50967045fd09c (patch) | |
| tree | 155588877154ae56b16e87c216be1c3a7566e472 | |
| parent | 26a3e01de61c8d1dc6a9a60b168fd788fa6e9f01 (diff) | |
Revert "cgroup: Disable IRQs while holding css_set_lock"
This reverts commit ac7b270e91c7b0d1b1c5544532852b55177004f1.
Signed-off-by: Chatur27 <jasonbright2709@gmail.com>
| -rw-r--r-- | kernel/cgroup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 1a797af7d40c..d36c4f914a1e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1621,10 +1621,10 @@ static int cgroup_show_path(struct seq_file *sf, struct kernfs_node *kf_node, if (!buf) return -ENOMEM; - spin_lock_irq(&css_set_lock); + spin_lock_bh(&css_set_lock); ns_cgroup = current_cgns_cgroup_from_root(kf_cgroot); len = kernfs_path_from_node(kf_node, ns_cgroup->kn, buf, PATH_MAX); - spin_unlock_irq(&css_set_lock); + spin_unlock_bh(&css_set_lock); if (len >= PATH_MAX) len = -ERANGE; @@ -2245,11 +2245,11 @@ out_mount: struct cgroup *cgrp; mutex_lock(&cgroup_mutex); - spin_lock_irq(&css_set_lock); + spin_lock_bh(&css_set_lock); cgrp = cset_cgroup_from_root(ns->root_cset, root); - spin_unlock_irq(&css_set_lock); + spin_unlock_bh(&css_set_lock); mutex_unlock(&cgroup_mutex); nsdentry = kernfs_node_dentry(cgrp->kn, dentry->d_sb); @@ -2322,11 +2322,11 @@ int cgroup_path_ns(struct cgroup *cgrp, char *buf, size_t buflen, int ret; mutex_lock(&cgroup_mutex); - spin_lock_irq(&css_set_lock); + spin_lock_bh(&css_set_lock); ret = cgroup_path_ns_locked(cgrp, buf, buflen, ns); - spin_unlock_irq(&css_set_lock); + spin_unlock_bh(&css_set_lock); mutex_unlock(&cgroup_mutex); return ret; |