summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-09-24 21:31:48 +0400
committerTejun Heo <tj@kernel.org>2014-09-24 21:31:48 +0400
commit9e804d1f58da1eca079f796347c1cf1d1df564e2 (patch)
tree5fc958822d1d44509a9003be88490ede36ae12f9 /lib
parenteecc16ba9a49b05dd847a317af166a6728eb56ca (diff)
downloadlinux-9e804d1f58da1eca079f796347c1cf1d1df564e2.tar.xz
percpu_ref: rename things to prepare for decoupling percpu/atomic mode switch
percpu_ref will be restructured so that percpu/atomic mode switching and reference killing are dedoupled. In preparation, do the following renames. * percpu_ref->confirm_kill -> percpu_ref->confirm_switch * __PERCPU_REF_DEAD -> __PERCPU_REF_ATOMIC * __percpu_ref_alive() -> __ref_is_percpu() This patch is pure rename and doesn't introduce any functional changes. Signed-off-by: Tejun Heo <tj@kernel.org> Reviewed-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/percpu-refcount.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
index 5aea6b7356c7..7aef590c1ef8 100644
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
@@ -34,7 +34,7 @@
static unsigned long __percpu *percpu_count_ptr(struct percpu_ref *ref)
{
return (unsigned long __percpu *)
- (ref->percpu_count_ptr & ~__PERCPU_REF_DEAD);
+ (ref->percpu_count_ptr & ~__PERCPU_REF_ATOMIC);
}
/**
@@ -80,7 +80,7 @@ void percpu_ref_exit(struct percpu_ref *ref)
if (percpu_count) {
free_percpu(percpu_count);
- ref->percpu_count_ptr = __PERCPU_REF_DEAD;
+ ref->percpu_count_ptr = __PERCPU_REF_ATOMIC;
}
}
EXPORT_SYMBOL_GPL(percpu_ref_exit);
@@ -117,8 +117,8 @@ static void percpu_ref_kill_rcu(struct rcu_head *rcu)
ref->release, atomic_long_read(&ref->count));
/* @ref is viewed as dead on all CPUs, send out kill confirmation */
- if (ref->confirm_kill)
- ref->confirm_kill(ref);
+ if (ref->confirm_switch)
+ ref->confirm_switch(ref);
/*
* Now we're in single atomic_long_t mode with a consistent
@@ -145,11 +145,11 @@ static void percpu_ref_kill_rcu(struct rcu_head *rcu)
void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
percpu_ref_func_t *confirm_kill)
{
- WARN_ONCE(ref->percpu_count_ptr & __PERCPU_REF_DEAD,
+ WARN_ONCE(ref->percpu_count_ptr & __PERCPU_REF_ATOMIC,
"%s called more than once on %pf!", __func__, ref->release);
- ref->percpu_count_ptr |= __PERCPU_REF_DEAD;
- ref->confirm_kill = confirm_kill;
+ ref->percpu_count_ptr |= __PERCPU_REF_ATOMIC;
+ ref->confirm_switch = confirm_kill;
call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu);
}
@@ -178,14 +178,14 @@ void percpu_ref_reinit(struct percpu_ref *ref)
/*
* Restore per-cpu operation. smp_store_release() is paired with
- * smp_read_barrier_depends() in __percpu_ref_alive() and
- * guarantees that the zeroing is visible to all percpu accesses
- * which can see the following __PERCPU_REF_DEAD clearing.
+ * smp_read_barrier_depends() in __ref_is_percpu() and guarantees
+ * that the zeroing is visible to all percpu accesses which can see
+ * the following __PERCPU_REF_ATOMIC clearing.
*/
for_each_possible_cpu(cpu)
*per_cpu_ptr(percpu_count, cpu) = 0;
smp_store_release(&ref->percpu_count_ptr,
- ref->percpu_count_ptr & ~__PERCPU_REF_DEAD);
+ ref->percpu_count_ptr & ~__PERCPU_REF_ATOMIC);
}
EXPORT_SYMBOL_GPL(percpu_ref_reinit);