net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq

Replace the bh safe variant with the hard irq safe variant.

We need a hard irq safe variant to deal with netpoll transmitting
packets from hard irq context, and we need it in most if not all of
the places using the bh safe variant.

Except on 32bit uni-processor the code is exactly the same so don't
bother with a bh variant, just have a hard irq safe variant that
everyone can use.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 36f8872cb072..c53fe0c9697c 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -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->syncp);
+                        start = u64_stats_fetch_begin_irq(&percpu_stats->syncp);
                         local_stats = *percpu_stats;
-                } while (u64_stats_fetch_retry_bh(&percpu_stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&percpu_stats->syncp, start));
 
                 stats->n_hit += local_stats.n_hit;
                 stats->n_missed += local_stats.n_missed;
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 3b4db3220456..42c0f4a0b78c 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -277,9 +277,9 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
                 percpu_stats = per_cpu_ptr(vport->percpu_stats, i);
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&percpu_stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&percpu_stats->syncp);
                         local_stats = *percpu_stats;
-                } while (u64_stats_fetch_retry_bh(&percpu_stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&percpu_stats->syncp, start));
 
                 stats->rx_bytes         += local_stats.rx_bytes;
                 stats->rx_packets       += local_stats.rx_packets;