bcachefs: Fix this_cpu_ptr() usage
authorKent Overstreet <kent.overstreet@gmail.com>
Sat, 3 Apr 2021 22:37:09 +0000 (18:37 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:58 +0000 (17:08 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/buckets.c

index 88deb48a3a37464fe6ccb7931b3c3aa74de36367..4c2485afe43cf366fa4f291e6feee95507809d3e 100644 (file)
@@ -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();