percpu-refcount: add __must_check to percpu_ref_init() and don't use ACCESS_ONCE...

[deliverable/linux.git] / lib / percpu-refcount.c

diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
index 9a78e55fa48f1573a98ec78c70809787e80a24dd..b35eaac2954fc2be30d64ed9f8ac0efadf6071d5 100644 (file)
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
@@ -57,12 +57,10 @@ int percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release)
 static void percpu_ref_kill_rcu(struct rcu_head *rcu)
 {
        struct percpu_ref *ref = container_of(rcu, struct percpu_ref, rcu);
-       unsigned __percpu *pcpu_count;
+       unsigned __percpu *pcpu_count = ref->pcpu_count;
        unsigned count = 0;
        int cpu;
 
-       pcpu_count = ACCESS_ONCE(ref->pcpu_count);
-
        /* Mask out PCPU_REF_DEAD */
        pcpu_count = (unsigned __percpu *)
                (((unsigned long) pcpu_count) & ~PCPU_STATUS_MASK);