[RHEL7,COMMIT] Revert "venet: add venet_free_stat callback"

Submitted by Konstantin Khorenko on Oct. 22, 2019, 3:22 p.m.

Details

Message ID 201910221522.x9MFM5jo027445@finist-ce7.sw.ru
State New
Series "Revert "venet: add venet_free_stat callback""
Headers show

Commit Message

Konstantin Khorenko Oct. 22, 2019, 3:22 p.m.
The commit is pushed to "branch-rh7-3.10.0-1062.1.2.vz7.114.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.1.2.vz7.114.8
------>
commit 46f1803c0be6df662b4449e5df6c330e80f3bac9
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Tue Oct 22 18:17:48 2019 +0300

    Revert "venet: add venet_free_stat callback"
    
    This reverts commit 4275964f99a30bfaad72a1e8c97a800655f45769.
    
    We don't have closed source modules long ago,
    so don't need venet_free_stat() callback.
    
    Fixes: a6fce566d713 ("drivers/net/ve: venet network device introduced")
    https://jira.sw.ru/browse/PSBM-69078
    
    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 6dee8576c542..28d06bca1f86 100644
--- a/drivers/net/venetdev.c
+++ b/drivers/net/venetdev.c
@@ -442,16 +442,10 @@  static int venet_close(struct net_device *master)
 	return 0;
 }
 
-void (*venet_free_stat)(struct ve_struct *) = NULL;
-EXPORT_SYMBOL(venet_free_stat);
-
 static void venet_destructor(struct net_device *dev)
 {
 	struct venet_stats *stats = (struct venet_stats *)dev->ml_priv;
 
-	if (venet_free_stat)
-		venet_free_stat(dev->nd_net->owner_ve);
-
 	free_percpu(stats->real_stats);
 	kfree(stats);
 	free_netdev(dev);
diff --git a/include/linux/venet.h b/include/linux/venet.h
index 8520b5579dfe..51e0abeb03d7 100644
--- a/include/linux/venet.h
+++ b/include/linux/venet.h
@@ -90,8 +90,6 @@  struct ext_entry_struct *venet_ext_lookup(struct ve_struct *ve,
 extern struct hlist_head ip_entry_hash_table[];
 extern spinlock_t veip_lock;
 
-extern void (*venet_free_stat)(struct ve_struct *);
-
 #define NIPQUAD(addr) \
 	((unsigned char *)&addr)[0], \
 	((unsigned char *)&addr)[1], \