From b753d4b338df70df1ee75db21a216385bb88b90b Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 3 Apr 2021 18:37:09 -0400 Subject: [PATCH] bcachefs: Fix this_cpu_ptr() usage Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/buckets.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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();