diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-10 23:34:02 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:07 -0400 |
commit | 109a4277124ca1a0ff670b519315c4f381c83ad3 (patch) | |
tree | 5ba0c3e03befc1f046f203a1548bee7d7950661d /fs/bcachefs | |
parent | 297d89343dd9be32878a747c53d3477c986a01b6 (diff) | |
download | linux-stable-109a4277124ca1a0ff670b519315c4f381c83ad3.tar.gz linux-stable-109a4277124ca1a0ff670b519315c4f381c83ad3.tar.bz2 linux-stable-109a4277124ca1a0ff670b519315c4f381c83ad3.zip |
bcachefs: Don't disable preemption unnecessarily
Small improvements to some percpu utility code.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs')
-rw-r--r-- | fs/bcachefs/util.c | 6 | ||||
-rw-r--r-- | fs/bcachefs/util.h | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c index f183c9d80e2c..f287bca8498d 100644 --- a/fs/bcachefs/util.c +++ b/fs/bcachefs/util.c @@ -893,13 +893,9 @@ void eytzinger0_find_test(void) */ u64 *bch2_acc_percpu_u64s(u64 __percpu *p, unsigned nr) { - u64 *ret; + u64 *ret = this_cpu_ptr(p); int cpu; - preempt_disable(); - ret = this_cpu_ptr(p); - preempt_enable(); - for_each_possible_cpu(cpu) { u64 *i = per_cpu_ptr(p, cpu); diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index 91aa8c0a0e09..a0cbebf190b4 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -715,10 +715,7 @@ static inline void percpu_u64_set(u64 __percpu *dst, u64 src) for_each_possible_cpu(cpu) *per_cpu_ptr(dst, cpu) = 0; - - preempt_disable(); - *this_cpu_ptr(dst) = src; - preempt_enable(); + this_cpu_write(*dst, src); } static inline void acc_u64s(u64 *acc, const u64 *src, unsigned nr) |