The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.40
------>
commit 39074cdf691380e0a1d8fcffeafcbb4f0e53ce70
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Fri Jun 11 15:08:00 2021 +0300
venetdev: drop src_lh/dst_lh lists from veip_struct
These lists were used for ip redirect, now it's not used,
so drop redundant fields.
Found during investigation of
https://jira.sw.ru/browse/PSBM-90395
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
Reviewed-by: Kirill Tkhai <ktk...@virtuozzo.com>
(cherry-picked from vz7 commit 3986d04a5b7f ("venetdev: drop src_lh/dst_lh
lists
from veip_struct"))
To_merge: 0a8795c36f83 ("drivers/net/ve: venet network device introduced")
Signed-off-by: Andrey Zhadchenko <andrey.zhadche...@virtuozzo.com>
---
drivers/net/venetdev.c | 6 ------
include/linux/venet.h | 2 --
2 files changed, 8 deletions(-)
diff --git a/drivers/net/venetdev.c b/drivers/net/venetdev.c
index 9d898bcbc6db..412e18ff55e2 100644
--- a/drivers/net/venetdev.c
+++ b/drivers/net/venetdev.c
@@ -62,10 +62,6 @@ int veip_put(struct veip_struct *veip)
{
if (!list_empty(&veip->ip_lh))
return 0;
- if (!list_empty(&veip->src_lh))
- return 0;
- if (!list_empty(&veip->dst_lh))
- return 0;
list_del(&veip->list);
call_rcu(&veip->rcu, veip_free);
@@ -196,8 +192,6 @@ struct veip_struct *veip_findcreate(envid_t veid)
return NULL;
memset(ptr, 0, sizeof(struct veip_struct));
INIT_LIST_HEAD(&ptr->ip_lh);
- INIT_LIST_HEAD(&ptr->src_lh);
- INIT_LIST_HEAD(&ptr->dst_lh);
INIT_LIST_HEAD(&ptr->ext_lh);
ptr->veid = veid;
list_add(&ptr->list, &veip_lh);
diff --git a/include/linux/venet.h b/include/linux/venet.h
index 651ce8f815ff..666bc314a56f 100644
--- a/include/linux/venet.h
+++ b/include/linux/venet.h
@@ -42,8 +42,6 @@ struct ext_entry_struct
struct veip_struct
{
- struct list_head src_lh;
- struct list_head dst_lh;
struct list_head ip_lh;
struct list_head list;
struct list_head ext_lh;
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
