Skip to content

Commit

Permalink
percpu_ref: Don't opencode percpu_ref_is_dying
Browse files Browse the repository at this point in the history
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Dennis Zhou <dennis@kernel.org>
  • Loading branch information
Nikolay Borisov authored and Dennis Zhou committed May 13, 2021
1 parent 6efb943 commit 9e9da02
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/percpu-refcount.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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);
else
__percpu_ref_switch_to_percpu(ref);
Expand Down Expand Up @@ -385,7 +385,7 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref,

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__,
ref->data->release);

Expand Down Expand Up @@ -465,7 +465,7 @@ void percpu_ref_resurrect(struct percpu_ref *ref)

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));

ref->percpu_count_ptr &= ~__PERCPU_REF_DEAD;
Expand Down

0 comments on commit 9e9da02

Please sign in to comment.