ovs: make functions local

shemminger · jessegross · commit 443cd88c8a31 · 2014-01-06T15:54:39.000-08:00
Several functions and datastructures could be local
Found with 'make namespacecheck'

Signed-off-by: Stephen Hemminger &lt;stephen@networkplumber.org&gt;
Signed-off-by: Jesse Gross &lt;jesse@nicira.com&gt;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
@@ -132,7 +132,7 @@ static struct datapath *get_dp(struct net *net, int dp_ifindex)
 }
 
 /* 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);
@@ -1466,7 +1466,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
 };
 
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
@@ -182,14 +182,12 @@ static inline struct vport *ovs_vport_ovsl(const struct datapath *dp, int port_n
 
 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);
 
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
@@ -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, struct sk_buff *skb)
  * 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);
 
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
@@ -192,7 +192,6 @@ static inline struct vport *vport_from_priv(const void *priv)
 
 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. */

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ static struct datapath get_dp(struct net net, int dp_ifindex)`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/* Must be called with rcu_read_lock or ovs_mutex. */`
`135`		`-const char ovs_dp_name(const struct datapath dp)`
	`135`	`+static const char ovs_dp_name(const struct datapath dp)`
`136`	`136`	`{`
`137`	`137`	`struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);`
`138`	`138`	`return vport->ops->get_name(vport);`
`@@ -1466,7 +1466,7 @@ struct genl_family dp_vport_genl_family = {`
`1466`	`1466`	`.parallel_ops = true,`
`1467`	`1467`	`};`
`1468`	`1468`
`1469`		`-struct genl_multicast_group ovs_dp_vport_multicast_group = {`
	`1469`	`+static struct genl_multicast_group ovs_dp_vport_multicast_group = {`
`1470`	`1470`	`.name = OVS_VPORT_MCGROUP`
`1471`	`1471`	`};`
`1472`	`1472`