[Devel,RHEL7,COMMIT] venet: make veip_find() helper static

Submitted by Konstantin Khorenko on April 22, 2017, 11:46 a.m.

Details

Message ID 201704221146.v3MBksFM027893@finist_cl7.x64_64.work.ct
State New
Series "Fix VEIP object handling on container destroy"
Headers show

Commit Message

Konstantin Khorenko April 22, 2017, 11:46 a.m.
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.30.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.16.1.vz7.30.4
------>
commit 7e1fe6ff6a53fbc6e5533e948c73e9b9deea13e9
Author: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Date:   Sat Apr 22 15:46:54 2017 +0400

    venet: make veip_find() helper static
    
    Patchset description:
    Fix VEIP object handling on container destroy
    
    Major changes to current behaviour:
    1) "SHUTDOWN" hook chain added
    2) VEIP object is destroyed in "SHUTDOWN" hook
    3) Now VEIP object live cycle is tightly bound to VE object. IOW, it won't be
    reused, but EEXIST will be returned instead.
    
    https://jira.sw.ru/browse/PSBM-64869
    
    Stanislav Kinsburskiy (6):
      venet: make veip_find() helper static
      venet: treat presence of veip object with the same VEID as error
      venet: split veip_stop() into protected and unprotected versions
      venet: veip_shutdown() helper introduced
      ve: add one more SHUTDOWN hooks chain
      venet: VEIP "SHUTDOWN" hook introduced
    
    =======================
    This patch description:
    
    This one is used only in one place.
    
    Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
---
 drivers/net/venetdev.c | 3 +--
 include/linux/venet.h  | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/net/venetdev.c b/drivers/net/venetdev.c
index 4a7876f..a4388fd 100644
--- a/drivers/net/venetdev.c
+++ b/drivers/net/venetdev.c
@@ -203,7 +203,7 @@  static void venet_ext_clean(struct ve_struct *ve)
 	spin_unlock(&veip_lock);
 }
 
-struct veip_struct *veip_find(envid_t veid)
+static struct veip_struct *veip_find(envid_t veid)
 {
 	struct veip_struct *ptr;
 
@@ -1226,7 +1226,6 @@  EXPORT_SYMBOL(ip_entry_unhash);
 EXPORT_SYMBOL(sockaddr_to_veaddr);
 EXPORT_SYMBOL(veaddr_print);
 EXPORT_SYMBOL(venet_entry_lookup);
-EXPORT_SYMBOL(veip_find);
 EXPORT_SYMBOL(veip_findcreate);
 EXPORT_SYMBOL(veip_put);
 EXPORT_SYMBOL(venet_ext_lookup);
diff --git a/include/linux/venet.h b/include/linux/venet.h
index dd7d9ff..7562996 100644
--- a/include/linux/venet.h
+++ b/include/linux/venet.h
@@ -77,7 +77,6 @@  void ip_entry_unhash(struct ip_entry_struct *entry);
 void ip_entry_unhash(struct ip_entry_struct *entry);
 struct ip_entry_struct *venet_entry_lookup(struct ve_addr_struct *);
 
-struct veip_struct *veip_find(envid_t veid);
 struct veip_struct *veip_findcreate(envid_t veid);
 int veip_put(struct veip_struct *veip);
 void veip_cleanup(void);