From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Wed, 15 Feb 2023 23:29:16 +0000 (-0500)
Subject: six locks: Simplify six_lock_counts()
X-Git-Tag: io_uring-6.7-2023-11-10~119^2~511
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0cc1bc84d69138531d8a5e163caa57dfacd58cf2;p=linux-block.git

six locks: Simplify six_lock_counts()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

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