[vz7,1/2] venetdev: drop src_lh/dst_lh lists from veip_struct

Submitted by Konstantin Khorenko on Dec. 27, 2018, 12:35 p.m.

Details

Message ID 20181227123515.20985-1-khorenko@virtuozzo.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Dec. 27, 2018, 12:35 p.m.
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>
---
 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;

Comments

Kirill Tkhai Dec. 27, 2018, 2:49 p.m.
On 27.12.2018 15:35, Konstantin Khorenko wrote:
> 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(-)
> 
> 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;
>