[RHEL7,COMMIT] venetdev: drop src_lh/dst_lh lists from veip_struct

Submitted by Konstantin Khorenko on Dec. 28, 2018, 2:49 p.m.

Details

Message ID 201812281449.wBSEn6qi023867@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Dec. 28, 2018, 2:49 p.m.
The commit is pushed to "branch-rh7-3.10.0-957.1.3.vz7.83.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.1.3.vz7.83.4
------>
commit 3986d04a5b7fa1ba856861bbb98a50ca3129a240
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Wed Dec 26 16:05:41 2018 +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 <khorenko@virtuozzo.com>
    Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 drivers/net/venetdev.c | 6 ------
 include/linux/venet.h  | 2 --
 2 files changed, 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/net/venetdev.c b/drivers/net/venetdev.c
index dd790d7c4ec3..429a74c77a4b 100644
--- a/drivers/net/venetdev.c
+++ b/drivers/net/venetdev.c
@@ -89,10 +89,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);
@@ -223,8 +219,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 08d89bc2419e..10bdce4973f7 100644
--- a/include/linux/venet.h
+++ b/include/linux/venet.h
@@ -44,8 +44,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;