percpu_ref: relocate percpu_ref_reinit()

percpu_ref is gonna go through restructuring.  Move
percpu_ref_reinit() after percpu_ref_kill_and_confirm().  This will
make later changes easier to follow and result in cleaner
organization.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Kent Overstreet <kmo@daterainc.com>

diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
index 5df6784bd9d2bf842276436af2a76428e1af759a..f015f139d491bf62bc7f009655e5c4130d5f7a6a 100644 (file)
--- a/include/linux/percpu-refcount.h
+++ b/include/linux/percpu-refcount.h
@@ -68,10 +68,10 @@ struct percpu_ref {
 
 int __must_check percpu_ref_init(struct percpu_ref *ref,
                                 percpu_ref_func_t *release, gfp_t gfp);
-void percpu_ref_reinit(struct percpu_ref *ref);
 void percpu_ref_exit(struct percpu_ref *ref);
 void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
                                 percpu_ref_func_t *confirm_kill);
+void percpu_ref_reinit(struct percpu_ref *ref);
 
 /**
  * percpu_ref_kill - drop the initial ref

diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
index 559ee0b20318126551828029c3a4b3a731909ca5..070dab5e7d77eae142015e8a06e7f391537c61da 100644 (file)
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
@@ -62,41 +62,6 @@ int percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release,
 }
 EXPORT_SYMBOL_GPL(percpu_ref_init);
 
-/**
- * percpu_ref_reinit - re-initialize a percpu refcount
- * @ref: perpcu_ref to re-initialize
- *
- * Re-initialize @ref so that it's in the same state as when it finished
- * percpu_ref_init().  @ref must have been initialized successfully, killed
- * and reached 0 but not exited.
- *
- * Note that percpu_ref_tryget[_live]() are safe to perform on @ref while
- * this function is in progress.
- */
-void percpu_ref_reinit(struct percpu_ref *ref)
-{
-       unsigned long __percpu *pcpu_count = pcpu_count_ptr(ref);
-       int cpu;
-
-       BUG_ON(!pcpu_count);
-       WARN_ON(!percpu_ref_is_zero(ref));
-
-       atomic_long_set(&ref->count, 1 + PCPU_COUNT_BIAS);
-
-       /*
-        * Restore per-cpu operation.  smp_store_release() is paired with
-        * smp_read_barrier_depends() in __pcpu_ref_alive() and guarantees
-        * that the zeroing is visible to all percpu accesses which can see
-        * the following PCPU_REF_DEAD clearing.
-        */
-       for_each_possible_cpu(cpu)
-               *per_cpu_ptr(pcpu_count, cpu) = 0;
-
-       smp_store_release(&ref->pcpu_count_ptr,
-                         ref->pcpu_count_ptr & ~PCPU_REF_DEAD);
-}
-EXPORT_SYMBOL_GPL(percpu_ref_reinit);
-
 /**
  * percpu_ref_exit - undo percpu_ref_init()
  * @ref: percpu_ref to exit
@@ -189,3 +154,38 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
        call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu);
 }
 EXPORT_SYMBOL_GPL(percpu_ref_kill_and_confirm);
+
+/**
+ * percpu_ref_reinit - re-initialize a percpu refcount
+ * @ref: perpcu_ref to re-initialize
+ *
+ * Re-initialize @ref so that it's in the same state as when it finished
+ * percpu_ref_init().  @ref must have been initialized successfully, killed
+ * and reached 0 but not exited.
+ *
+ * Note that percpu_ref_tryget[_live]() are safe to perform on @ref while
+ * this function is in progress.
+ */
+void percpu_ref_reinit(struct percpu_ref *ref)
+{
+       unsigned long __percpu *pcpu_count = pcpu_count_ptr(ref);
+       int cpu;
+
+       BUG_ON(!pcpu_count);
+       WARN_ON(!percpu_ref_is_zero(ref));
+
+       atomic_long_set(&ref->count, 1 + PCPU_COUNT_BIAS);
+
+       /*
+        * Restore per-cpu operation.  smp_store_release() is paired with
+        * smp_read_barrier_depends() in __pcpu_ref_alive() and guarantees
+        * that the zeroing is visible to all percpu accesses which can see
+        * the following PCPU_REF_DEAD clearing.
+        */
+       for_each_possible_cpu(cpu)
+               *per_cpu_ptr(pcpu_count, cpu) = 0;
+
+       smp_store_release(&ref->pcpu_count_ptr,
+                         ref->pcpu_count_ptr & ~PCPU_REF_DEAD);
+}
+EXPORT_SYMBOL_GPL(percpu_ref_reinit);