Revert "cgroup: Move rcu_head up near the top of cgroup_root"

This reverts commit 0e76e9bb1d which is
commit a7fb0423c201ba12815877a0b5a68a6a1710b23a upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ib15a38a3826b47d2a058a29c6b042107e70d2e33
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-09-30 15:23:32 +00:00
parent 4786dae0bb
commit b4c085bbdb

View File

@@ -525,10 +525,6 @@ struct cgroup_root {
/* Unique id for this hierarchy. */
int hierarchy_id;
/* A list running through the active hierarchies */
struct list_head root_list;
struct rcu_head rcu; /* Must be near the top */
/*
* The root cgroup. The containing cgroup_root will be destroyed on its
* release. cgrp->ancestors[0] will be used overflowing into the
@@ -542,6 +538,10 @@ struct cgroup_root {
/* Number of cgroups in the hierarchy, used only for /proc/cgroups */
atomic_t nr_cgrps;
/* A list running through the active hierarchies */
struct list_head root_list;
struct rcu_head rcu;
/* Hierarchy-specific flags */
unsigned int flags;