Drop cgroup-v1-add-disabled-controller-check-in-cgroup1_p.patch from 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/cgroup-v1-add-disabled-controller-check-in-cgroup1_p.patch b/queue-5.4/cgroup-v1-add-disabled-controller-check-in-cgroup1_p.patch
deleted file mode 100644 (file)
index 01255e0..0000000
--- a/queue-5.4/cgroup-v1-add-disabled-controller-check-in-cgroup1_p.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 85fb22459cd84a3cee1a1d36a32ba119f7b1c5e7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Jan 2021 17:37:17 +0800
-Subject: cgroup-v1: add disabled controller check in cgroup1_parse_param()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Chen Zhou <chenzhou10@huawei.com>
-
-[ Upstream commit 61e960b07b637f0295308ad91268501d744c21b5 ]
-
-When mounting a cgroup hierarchy with disabled controller in cgroup v1,
-all available controllers will be attached.
-For example, boot with cgroup_no_v1=cpu or cgroup_disable=cpu, and then
-mount with "mount -t cgroup -ocpu cpu /sys/fs/cgroup/cpu", then all
-enabled controllers will be attached except cpu.
-
-Fix this by adding disabled controller check in cgroup1_parse_param().
-If the specified controller is disabled, just return error with information
-"Disabled controller xx" rather than attaching all the other enabled
-controllers.
-
-Fixes: f5dfb5315d34 ("cgroup: take options parsing into ->parse_monolithic()")
-Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
-Reviewed-by: Zefan Li <lizefan.x@bytedance.com>
-Reviewed-by: Michal Koutný <mkoutny@suse.com>
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/cgroup/cgroup-v1.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
-index 79682c23407c9..ebe541f46fe95 100644
---- a/kernel/cgroup/cgroup-v1.c
-+++ b/kernel/cgroup/cgroup-v1.c
-@@ -923,6 +923,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
-               for_each_subsys(ss, i) {
-                       if (strcmp(param->key, ss->legacy_name))
-                               continue;
-+                      if (!cgroup_ssid_enabled(i) || cgroup1_ssid_disabled(i))
-+                              return invalfc(fc, "Disabled controller '%s'",
-+                                             param->key);
-                       ctx->subsys_mask |= (1 << i);
-                       return 0;
-               }
--- 
-2.27.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 10e64d33a742bf2d79a9e70943ac59417cce664f..dfc4a6977bed6cf83eafbadade814f466439ea9a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -23,7 +23,6 @@ arm-ensure-the-signal-page-contains-defined-contents.patch
 arm-kexec-fix-oops-after-tlb-are-invalidated.patch
 vmlinux.lds.h-create-section-for-protection-against-.patch
 lkdtm-don-t-move-ctors-to-.rodata.patch
-cgroup-v1-add-disabled-controller-check-in-cgroup1_p.patch
 mt76-dma-fix-a-possible-memory-leak-in-mt76_add_frag.patch
 drm-vc4-hvs-fix-buffer-overflow-with-the-dlist-handl.patch
 bpf-check-for-integer-overflow-when-using-roundup_po.patch