[Devel] [PATCH RHEL10 COMMIT] ve: Fix put_ve() cleanup helper

Konstantin Khorenko khorenko at virtuozzo.com
Tue Dec 2 14:38:46 MSK 2025


The commit is pushed to "branch-rh10-6.12.0-55.13.1.2.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-55.13.1.2.22.vz10
------>
commit aec29447c3ab207b492a9d06e233425c17267ab1
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Tue Dec 2 18:17:48 2025 +0800

    ve: Fix put_ve() cleanup helper
    
    Comment to DEFINE_FREE() explicitly encourages us to include NULL test
    in the DEFINE_FREE() statement even when its callback already has a NULL
    check inside it. That allows compiler simplify resulting code by
    compiling out the cleanup path in case it's not required.
    
    Fixes: 9505e1b00c3f ("ve: Add put_ve() cleanup helper")
    https://virtuozzo.atlassian.net/browse/VSTOR-118289
    Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
    
    Feature: ve: ve generic structures
---
 include/linux/ve.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/ve.h b/include/linux/ve.h
index f664740041001..0fbc4c45525fc 100644
--- a/include/linux/ve.h
+++ b/include/linux/ve.h
@@ -323,6 +323,6 @@ static inline int ve_get_cpu_avenrun(struct ve_struct *ve, unsigned long *avenru
 static inline int ve_get_cpu_stat(struct ve_struct *ve, struct kernel_cpustat *kstat) { return -ENOSYS; }
 #endif
 
-DEFINE_FREE(put_ve, struct ve_struct *, put_ve(_T))
+DEFINE_FREE(put_ve, struct ve_struct *, if (_T) put_ve(_T))
 
 #endif /* _LINUX_VE_H */


More information about the Devel mailing list