[Devel] [PATCH RHEL7 COMMIT] Revert "ve/netfilter/ipt_CLUSTERIP: Pass ve net instead of init_net"

Konstantin Khorenko khorenko at virtuozzo.com
Mon Jun 29 06:58:45 PDT 2015


The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.22
------>
commit 8381478ff63d1e9efea78b1b8bf007a9757faa4f
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Mon Jun 29 17:58:45 2015 +0400

    Revert "ve/netfilter/ipt_CLUSTERIP: Pass ve net instead of init_net"
    
    This reverts commit 05f27248a3f1e0154d22d77bbc7987b34e3d1936.
    
    netfilter/ipt_CLUSTERIP has been turned per net namespace upstream, so
    we'd better drop this hack and pull the upstream code instead. This will
    be done by the following patches.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 net/ipv4/netfilter/ipt_CLUSTERIP.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 79944da..a2e2b61 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -384,8 +384,7 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)
 				return -EINVAL;
 			}
 
-			dev = dev_get_by_name(get_exec_env()->ve_netns,
-					      e->ip.iniface);
+			dev = dev_get_by_name(&init_net, e->ip.iniface);
 			if (!dev) {
 				pr_info("no such interface %s\n",
 					e->ip.iniface);



More information about the Devel mailing list