openvswitch: rename ->sync to ->syncp
Subsystems (3)
PATCH 1/1 openvswitch: rename ->sync to ->syncp
Openvswitch defines u64_stats_sync as ->sync rather than ->syncp,
so fails to compile with netdev_alloc_pcpu_stats(). So just rename it to ->syncp.
Reported-by kbuild test robot <[email protected]>
Fixes 1c213bd24ad04f4430031 (net: introduce netdev_alloc_pcpu_stats() for drivers)
Cc David S. Miller <[email protected]>
Signed-off-by Cong Wang <[email protected]>
---
net/openvswitch/datapath.c +6 -6
@@ -256,10 +256,10 @@ void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb) out:/* Update datapath statistics. */ -u64_stats_update_begin (&stats->sync); +u64_stats_update_begin (&stats->syncp); (*stats_counter)++; stats->n_mask_hit += n_mask_hit; -u64_stats_update_end (&stats->sync); +u64_stats_update_end (&stats->syncp); }static struct genl_family dp_packet_genl_family = {
@@ -295,9 +295,9 @@ int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb, err: stats =this_cpu_ptr (dp->stats_percpu); -u64_stats_update_begin (&stats->sync); +u64_stats_update_begin (&stats->syncp); stats->n_lost++; -u64_stats_update_end (&stats->sync); +u64_stats_update_end (&stats->syncp);return err; }
@@ -606,9 +606,9 @@ static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats, percpu_stats =per_cpu_ptr (dp->stats_percpu, i);do { - start =u64_stats_fetch_begin_bh (&percpu_stats->sync); + start =u64_stats_fetch_begin_bh (&percpu_stats->syncp); local_stats = *percpu_stats; - }while (u64_stats_fetch_retry_bh (&percpu_stats->sync, start)); + }while (u64_stats_fetch_retry_bh (&percpu_stats->syncp, start)); stats->n_hit += local_stats.n_hit; stats->n_missed += local_stats.n_missed;
net/openvswitch/datapath.h +1 -1
@@ -55,7 +55,7 @@ struct dp_stats_percpu {u64 n_missed;u64 n_lost;u64 n_mask_hit; -struct u64_stats_sync sync; +struct u64_stats_sync syncp; };/**
Quoted 9 lines · Cong Wang
Openvswitch defines
u64_stats_syncas ->sync rather than ->syncp,
so fails to compile withnetdev_alloc_pcpu_stats(). So just rename it to ->syncp.Reported-by kbuild test robot <[email protected]>Fixes 1c213bd24ad04f4430031 (net: introduce netdev_alloc_pcpu_stats() for drivers)Cc David S. Miller <[email protected]>Signed-off-by Cong Wang <[email protected]>---
Reviewed-by Flavio Leitner <[email protected]>
From: Cong Wang <[email protected]>
Date: Fri, 14 Feb 2014 15:10:46 -0800
Quoted 7 lines
Openvswitch defines
u64_stats_syncas ->sync rather than ->syncp,
so fails to compile withnetdev_alloc_pcpu_stats(). So just rename it to ->syncp.Reported-by kbuild test robot <[email protected]>Fixes 1c213bd24ad04f4430031 (net: introduce netdev_alloc_pcpu_stats() for drivers)Cc David S. Miller <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied, thanks.