[Devel] [PATCH RHEL10 COMMIT] fixup! ve: Rename ve_ns to ve_nsproxy
Konstantin Khorenko
khorenko at virtuozzo.com
Fri Jun 5 21:32:00 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 fa8dc082bf3c68a8410098ef93e7a5cde63c8d7a
Author: Vladimir Riabchun <vladimir.riabchun at virtuozzo.com>
Date: Tue Jun 2 21:10:24 2026 +0000
fixup! ve: Rename ve_ns to ve_nsproxy
Provide correct ve_net 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>
---
fs/nfsd/nfs4recover.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 563bac6305d7f..cea49c678665b 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1887,7 +1887,11 @@ nfsd4_umh_cltrack_init(struct net *net)
struct net *ve_net;
rcu_read_lock();
+#ifdef CONFIG_VE
ve_net = rcu_dereference(get_exec_env()->ve_nsproxy)->net_ns;
+#else
+ ve_net = &init_net;
+#endif
if (!net_eq(net, ve_net)) {
rcu_read_unlock();
More information about the Devel
mailing list