aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/flow.c
diff options
context:
space:
mode:
authorJarno Rajahalme <jrajahalme@nicira.com>2014-05-05 11:32:17 -0700
committerPravin B Shelar <pshelar@nicira.com>2014-05-22 16:27:34 -0700
commitbb6f9a708d4067713afae2e9eb2637f6b4c01ecb (patch)
tree2df408598e97bcb98c9204c62addb5b187a48153 /net/openvswitch/flow.c
parentopenvswitch: Avoid assigning a NULL pointer to flow actions. (diff)
downloadlinux-dev-bb6f9a708d4067713afae2e9eb2637f6b4c01ecb.tar.xz
linux-dev-bb6f9a708d4067713afae2e9eb2637f6b4c01ecb.zip
openvswitch: Clarify locking.
Remove unnecessary locking from functions that are always called with appropriate locking. Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com> Signed-off-by: Thomas Graf <tgraf@redhat.com> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to '')
-rw-r--r--net/openvswitch/flow.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 6d8d2da0a8ec..1019fc1db06e 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -122,6 +122,7 @@ unlock:
spin_unlock(&stats->lock);
}
+/* Called with ovs_mutex. */
void ovs_flow_stats_get(struct sw_flow *flow, struct ovs_flow_stats *ovs_stats,
unsigned long *used, __be16 *tcp_flags)
{
@@ -132,7 +133,7 @@ void ovs_flow_stats_get(struct sw_flow *flow, struct ovs_flow_stats *ovs_stats,
memset(ovs_stats, 0, sizeof(*ovs_stats));
for_each_node(node) {
- struct flow_stats *stats = rcu_dereference(flow->stats[node]);
+ struct flow_stats *stats = ovsl_dereference(flow->stats[node]);
if (stats) {
/* Local CPU may write on non-local stats, so we must