The commit is pushed to "branch-rh7-3.10.0-1160.11.1.vz7.172.x-ovz" and will 
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.11.1.vz7.172.14
------>
commit 127848f4eb4496be06248dd9a63ae3915472e68b
Author: Pavel Tikhomirov <[email protected]>
Date:   Mon Feb 22 21:50:26 2021 +0300

    ve/kmod: fix misprint in fib modules autoload allow rules
    
    When testing criu to suspend resume "fib" rules I found out that we have
    wrong names for fib module aliases, and thus can't load them on restore
    if they are not yet loaded.
    
    Perf shows when restoring centos 8 CT with docker:
    probe:module_payload_iptable_allowed: module_string="nft-expr-2-fib"
    
    https://jira.sw.ru/browse/PSBM-125002
    
    Fixes: 84beb0e73874a ("ve/kmod: make fib modules autoloadable from CT")
    Signed-off-by: Pavel Tikhomirov <[email protected]>
---
 kernel/kmod.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/kmod.c b/kernel/kmod.c
index aded876..a357d0b 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -372,8 +372,8 @@ static struct {
        { "nf-logger-7-1",      VE_IP_IPTABLES                  },
        { "nf-logger-10-1",     VE_IP_IPTABLES6                 },
 
-       { "nf-expr-1-fib",      VE_IP_IPTABLES                  },
-       { "nf-expr-2-fib",      VE_IP_IPTABLES                  },
+       { "nft-expr-1-fib",     VE_IP_IPTABLES                  },
+       { "nft-expr-2-fib",     VE_IP_IPTABLES                  },
        { "nft-expr-10-fib",    VE_IP_IPTABLES6                 },
        { "nft_fib",            VE_IP_IPTABLES                  },
 };
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to