summaryrefslogtreecommitdiff
path: root/libbcachefs
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-04-04 22:25:32 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2021-04-04 22:25:32 -0400
commitce906d661e63d4318b9f26ec145f2ff5fddf5162 (patch)
treec14e05e09bc680c51ef30d5dfa8b6ce742d5df7a /libbcachefs
parent08e14f84d9ca9b06443d7e54989731d9e03a6dc0 (diff)
Update bcachefs sources to 6a3927a96b fixup! bcachefs: Don't use write side of mark_lock in journal write path
Diffstat (limited to 'libbcachefs')
-rw-r--r--libbcachefs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libbcachefs/super.c b/libbcachefs/super.c
index 4eaa4cee..670e9cdc 100644
--- a/libbcachefs/super.c
+++ b/libbcachefs/super.c
@@ -496,6 +496,7 @@ static void __bch2_fs_free(struct bch_fs *c)
for_each_possible_cpu(cpu)
kfree(per_cpu_ptr(c->btree_iters_bufs, cpu)->iter);
+ free_percpu(c->online_reserved);
free_percpu(c->btree_iters_bufs);
free_percpu(c->pcpu);
mempool_exit(&c->large_bkey_pool);
@@ -775,6 +776,7 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts)
BIOSET_NEED_BVECS) ||
!(c->pcpu = alloc_percpu(struct bch_fs_pcpu)) ||
!(c->btree_iters_bufs = alloc_percpu(struct btree_iter_buf)) ||
+ !(c->online_reserved = alloc_percpu(u64)) ||
mempool_init_kvpmalloc_pool(&c->btree_bounce_pool, 1,
btree_bytes(c)) ||
mempool_init_kmalloc_pool(&c->large_bkey_pool, 1, 2048) ||