From 0cc1bc84d69138531d8a5e163caa57dfacd58cf2 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 15 Feb 2023 18:29:16 -0500 Subject: [PATCH] six locks: Simplify six_lock_counts() Signed-off-by: Kent Overstreet --- fs/bcachefs/six.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/fs/bcachefs/six.c b/fs/bcachefs/six.c index 5d003e41ae43..e1e9df0368b6 100644 --- a/fs/bcachefs/six.c +++ b/fs/bcachefs/six.c @@ -830,19 +830,12 @@ struct six_lock_count six_lock_counts(struct six_lock *lock) { struct six_lock_count ret; - ret.n[SIX_LOCK_read] = 0; + ret.n[SIX_LOCK_read] = !lock->readers + ? lock->state.read_lock + : pcpu_read_count(lock); ret.n[SIX_LOCK_intent] = lock->state.intent_lock + lock->intent_lock_recurse; ret.n[SIX_LOCK_write] = lock->state.seq & 1; - if (!lock->readers) - ret.n[SIX_LOCK_read] += lock->state.read_lock; - else { - int cpu; - - for_each_possible_cpu(cpu) - ret.n[SIX_LOCK_read] += *per_cpu_ptr(lock->readers, cpu); - } - return ret; } EXPORT_SYMBOL_GPL(six_lock_counts); -- 2.25.1