From ce906d661e63d4318b9f26ec145f2ff5fddf5162 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 4 Apr 2021 22:25:32 -0400 Subject: [PATCH] Update bcachefs sources to 6a3927a96b fixup! bcachefs: Don't use write side of mark_lock in journal write path --- .bcachefs_revision | 2 +- libbcachefs/super.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 7a002c2e..7b12d288 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -f26267fc82539ef3390cf2bb2bc818436dd504c7 +6a3927a96b2f362deccc7ee36e20e03f193a9e00 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) ||