summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-04-04 01:37:09 +0300
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-23 00:08:58 +0300
commitb753d4b338df70df1ee75db21a216385bb88b90b (patch)
tree05738b2e877540c18ddcd39e95025685693039f9
parent2d587674bad9cf83db0cc43185eb7e2d913cf41f (diff)
downloadlinux-b753d4b338df70df1ee75db21a216385bb88b90b.tar.xz
bcachefs: Fix this_cpu_ptr() usage
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--fs/bcachefs/buckets.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 88deb48a3a37..4c2485afe43c 100644
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -1392,7 +1392,7 @@ static int bch2_fs_usage_apply(struct bch_fs *c,
struct disk_reservation *disk_res,
unsigned journal_seq)
{
- struct bch_fs_usage *dst = fs_usage_ptr(c, journal_seq, false);
+ struct bch_fs_usage *dst;
s64 added = src->u.data + src->u.reserved;
s64 should_not_have_added;
int ret = 0;
@@ -1420,6 +1420,7 @@ static int bch2_fs_usage_apply(struct bch_fs *c,
this_cpu_add(*c->online_reserved, src->online_reserved);
preempt_disable();
+ dst = fs_usage_ptr(c, journal_seq, false);
acc_u64s((u64 *) dst, (u64 *) &src->u, fs_usage_u64s(c));
preempt_enable();