[Devel] [PATCH RHEL10 COMMIT] fixup! ve/cgroup: Add ve_owner field to cgroup

Konstantin Khorenko khorenko at virtuozzo.com
Fri Jun 5 21:32:15 MSK 2026


The commit is pushed to "branch-rh10-6.12.0-55.52.1.5.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-55.52.1.5.29.vz10
------>
commit e3cf7bd938e2244635408d9b70cd2e176c4dc52a
Author: Vladimir Riabchun <vladimir.riabchun at virtuozzo.com>
Date:   Tue Jun 2 21:10:43 2026 +0000

    fixup! ve/cgroup: Add ve_owner field to cgroup
    
    cgroup_ve_owner has prototype only when CONFIG_VE.
    
    https://virtuozzo.atlassian.net/browse/VSTOR-130116
    
    Feature: !CONFIG_VE build
    Signed-off-by: Vladimir Riabchun <vladimir.riabchun at virtuozzo.com>
    Reviewed-by: Vasileios Almpanis <vasileios.almpanis at virtuozzo.com>
---
 kernel/cgroup/cgroup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 02fd4513dcbdc..0a76aa056c0f9 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -328,6 +328,7 @@ bool cgroup_on_dfl(const struct cgroup *cgrp)
 	return cgrp->root == &cgrp_dfl_root;
 }
 
+#ifdef CONFIG_VE
 /*
  * The ve returned should be used only while holding rcu_read_lock
  */
@@ -341,6 +342,7 @@ struct ve_struct *cgroup_ve_owner(struct cgroup *cgrp)
 		ve = rcu_dereference(ve_root->ve_owner);
 	return ve;
 }
+#endif /* CONFIG_VE */
 
 /* IDR wrappers which synchronize using cgroup_idr_lock */
 static int cgroup_idr_alloc(struct idr *idr, void *ptr, int start, int end,


More information about the Devel mailing list