[ovs-dev] [PATCH net-next] ovs: make functions local

Stephen Hemminger stephen at networkplumber.org
Tue Dec 17 19:22:48 UTC 2013


Several functions and datastructures could be local
Found with 'make namespacecheck'

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>


--- a/net/openvswitch/datapath.c	2013-12-05 14:47:26.092495160 -0800
+++ b/net/openvswitch/datapath.c	2013-12-17 09:11:42.744892746 -0800
@@ -133,7 +133,7 @@ static struct datapath *get_dp(struct ne
 }
 
 /* Must be called with rcu_read_lock or ovs_mutex. */
-const char *ovs_dp_name(const struct datapath *dp)
+static const char *ovs_dp_name(const struct datapath *dp)
 {
 	struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);
 	return vport->ops->get_name(vport);
@@ -1441,7 +1441,7 @@ struct genl_family dp_vport_genl_family
 	.parallel_ops = true,
 };
 
-struct genl_multicast_group ovs_dp_vport_multicast_group = {
+static struct genl_multicast_group ovs_dp_vport_multicast_group = {
 	.name = OVS_VPORT_MCGROUP
 };
 
--- a/net/openvswitch/datapath.h	2013-12-05 14:47:26.092495160 -0800
+++ b/net/openvswitch/datapath.h	2013-12-17 09:11:49.348803638 -0800
@@ -178,14 +178,12 @@ static inline struct vport *ovs_vport_ov
 
 extern struct notifier_block ovs_dp_device_notifier;
 extern struct genl_family dp_vport_genl_family;
-extern struct genl_multicast_group ovs_dp_vport_multicast_group;
 
 void ovs_dp_process_received_packet(struct vport *, struct sk_buff *);
 void ovs_dp_detach_port(struct vport *);
 int ovs_dp_upcall(struct datapath *, struct sk_buff *,
 		  const struct dp_upcall_info *);
 
-const char *ovs_dp_name(const struct datapath *dp);
 struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
 					 u8 cmd);
 
--- a/net/openvswitch/vport.c	2013-12-05 14:47:26.092495160 -0800
+++ b/net/openvswitch/vport.c	2013-12-17 09:09:47.894434561 -0800
@@ -33,6 +33,9 @@
 #include "vport.h"
 #include "vport-internal_dev.h"
 
+static void ovs_vport_record_error(struct vport *,
+				   enum vport_err_type err_type);
+
 /* List of statically compiled vport implementations.  Don't forget to also
  * add yours to the list at the bottom of vport.h. */
 static const struct vport_ops *vport_ops_list[] = {
@@ -396,7 +399,8 @@ int ovs_vport_send(struct vport *vport,
  * If using the vport generic stats layer indicate that an error of the given
  * type has occurred.
  */
-void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)
+static void ovs_vport_record_error(struct vport *vport,
+				   enum vport_err_type err_type)
 {
 	spin_lock(&vport->stats_lock);
 
--- a/net/openvswitch/vport.h	2013-10-06 14:48:25.018449339 -0700
+++ b/net/openvswitch/vport.h	2013-12-17 09:09:13.898887766 -0800
@@ -192,7 +192,6 @@ static inline struct vport *vport_from_p
 
 void ovs_vport_receive(struct vport *, struct sk_buff *,
 		       struct ovs_key_ipv4_tunnel *);
-void ovs_vport_record_error(struct vport *, enum vport_err_type err_type);
 
 /* List of statically compiled vport implementations.  Don't forget to also
  * add yours to the list at the top of vport.c. */



More information about the dev mailing list