[Devel] [PATCH RHEL7 COMMIT] vznetstat: Kill unused venet_acct_classify_sub_outgoing()

Vasily Averin vvs at virtuozzo.com
Wed Oct 7 08:19:22 MSK 2020


The commit is pushed to "branch-rh7-3.10.0-1127.18.2.vz7.163.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.18.2.vz7.163.34
------>
commit 63f1751e1338f7f560d3e4c6baef9b4860a3350f
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Wed Oct 7 08:19:22 2020 +0300

    vznetstat: Kill unused venet_acct_classify_sub_outgoing()
    
    https://jira.sw.ru/browse/PSBM-120713
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 include/linux/vznetstat.h       |  3 ---
 kernel/ve/vznetstat/vznetstat.c | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/include/linux/vznetstat.h b/include/linux/vznetstat.h
index ca5da0b..1b8bbce 100644
--- a/include/linux/vznetstat.h
+++ b/include/linux/vznetstat.h
@@ -59,7 +59,6 @@ void   venet_acct_put_stat(struct venet_stat *);
 
 void venet_acct_classify_add_incoming(struct venet_stat *, struct sk_buff *skb);
 void venet_acct_classify_add_outgoing(struct venet_stat *, struct sk_buff *skb);
-void venet_acct_classify_sub_outgoing(struct venet_stat *, struct sk_buff *skb);
 
 void venet_acct_classify_add_incoming_plain(struct venet_stat *stat,
 		struct ve_addr_struct *src_addr, int data_size);
@@ -74,8 +73,6 @@ static inline void venet_acct_classify_add_incoming(struct venet_stat *stat,
 						struct sk_buff *skb) {}
 static inline void venet_acct_classify_add_outgoing(struct venet_stat *stat,
 						struct sk_buff *skb) {}
-static inline void venet_acct_classify_sub_outgoing(struct venet_stat *stat,
-						struct sk_buff *skb) {}
 
 static inline void venet_acct_classify_add_incoming_plain(struct venet_stat *stat,
 		struct ve_addr_struct *src_addr, int data_size) {}
diff --git a/kernel/ve/vznetstat/vznetstat.c b/kernel/ve/vznetstat/vznetstat.c
index f366325..aa8d007 100644
--- a/kernel/ve/vznetstat/vznetstat.c
+++ b/kernel/ve/vznetstat/vznetstat.c
@@ -753,15 +753,6 @@ void venet_acct_classify_add_outgoing(struct venet_stat *stat, struct sk_buff *s
 	venet_acct_mark(stat, skb, class);
 }
 
-void venet_acct_classify_sub_outgoing(struct venet_stat *stat, struct sk_buff *skb)
-{
-	int class;
-
-	class = acct_one_skb(stat, skb, ACCT_OUT, -venet_acct_skb_size(skb));
-	/* Do not forget to mark skb for traffic shaper */
-	venet_acct_mark(stat, skb, class);
-}
-
 void venet_acct_classify_add_incoming_plain(struct venet_stat *stat,
 		struct ve_addr_struct *src_addr, int data_size)
 {
@@ -1190,7 +1181,6 @@ EXPORT_SYMBOL(venet_acct_find_stat);
 EXPORT_SYMBOL(venet_acct_put_stat);
 EXPORT_SYMBOL(venet_acct_classify);
 EXPORT_SYMBOL(venet_acct_classify_add_outgoing);
-EXPORT_SYMBOL(venet_acct_classify_sub_outgoing);
 EXPORT_SYMBOL(venet_acct_classify_add_incoming);
 EXPORT_SYMBOL(venet_acct_classify_add_incoming_plain);
 EXPORT_SYMBOL(venet_acct_classify_add_outgoing_plain);


More information about the Devel mailing list