percpu_ref: Don't opencode percpu_ref_is_dying
Signed-off-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Dennis Zhou <dennis@kernel.org>
This commit is contained in:
parent
6efb943b86
commit
9e9da02a68
|
@ -275,7 +275,7 @@ static void __percpu_ref_switch_mode(struct percpu_ref *ref,
|
||||||
wait_event_lock_irq(percpu_ref_switch_waitq, !data->confirm_switch,
|
wait_event_lock_irq(percpu_ref_switch_waitq, !data->confirm_switch,
|
||||||
percpu_ref_switch_lock);
|
percpu_ref_switch_lock);
|
||||||
|
|
||||||
if (data->force_atomic || (ref->percpu_count_ptr & __PERCPU_REF_DEAD))
|
if (data->force_atomic || percpu_ref_is_dying(ref))
|
||||||
__percpu_ref_switch_to_atomic(ref, confirm_switch);
|
__percpu_ref_switch_to_atomic(ref, confirm_switch);
|
||||||
else
|
else
|
||||||
__percpu_ref_switch_to_percpu(ref);
|
__percpu_ref_switch_to_percpu(ref);
|
||||||
|
@ -385,7 +385,7 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
|
||||||
|
|
||||||
spin_lock_irqsave(&percpu_ref_switch_lock, flags);
|
spin_lock_irqsave(&percpu_ref_switch_lock, flags);
|
||||||
|
|
||||||
WARN_ONCE(ref->percpu_count_ptr & __PERCPU_REF_DEAD,
|
WARN_ONCE(percpu_ref_is_dying(ref),
|
||||||
"%s called more than once on %ps!", __func__,
|
"%s called more than once on %ps!", __func__,
|
||||||
ref->data->release);
|
ref->data->release);
|
||||||
|
|
||||||
|
@ -465,7 +465,7 @@ void percpu_ref_resurrect(struct percpu_ref *ref)
|
||||||
|
|
||||||
spin_lock_irqsave(&percpu_ref_switch_lock, flags);
|
spin_lock_irqsave(&percpu_ref_switch_lock, flags);
|
||||||
|
|
||||||
WARN_ON_ONCE(!(ref->percpu_count_ptr & __PERCPU_REF_DEAD));
|
WARN_ON_ONCE(!percpu_ref_is_dying(ref));
|
||||||
WARN_ON_ONCE(__ref_is_percpu(ref, &percpu_count));
|
WARN_ON_ONCE(__ref_is_percpu(ref, &percpu_count));
|
||||||
|
|
||||||
ref->percpu_count_ptr &= ~__PERCPU_REF_DEAD;
|
ref->percpu_count_ptr &= ~__PERCPU_REF_DEAD;
|
||||||
|
|
Loading…
Reference in New Issue