diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-17 18:40:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-17 19:14:21 -0400 |
| commit | 5f6dd446bf8e117be09c81fb3c2e6c324fe0dfa1 (patch) | |
| tree | b2ac09263fa5577351d7bed3468803716c6922ba | |
| parent | bb64c479a76493262ef121f053c1b3752195eebb (diff) | |
fixup! bcachefs: Fix usage of six lock's percpu mode
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 5 | ||||
| -rw-r--r-- | fs/bcachefs/debug.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index acbad5118347..366ec2c9c8af 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1097,11 +1097,6 @@ static void bch2_btree_set_root_inmem(struct bch_fs *c, struct btree *b) list_del_init(&b->list); mutex_unlock(&c->btree_cache.lock); - if (b->c.level) - six_lock_pcpu_alloc(&b->c.lock); - else - six_lock_pcpu_free(&b->c.lock); - mutex_lock(&c->btree_root_lock); BUG_ON(btree_node_root(c, b) && (b->c.level < btree_node_root(c, b)->c.level || diff --git a/fs/bcachefs/debug.c b/fs/bcachefs/debug.c index 2d65ae370931..3b869be18506 100644 --- a/fs/bcachefs/debug.c +++ b/fs/bcachefs/debug.c @@ -443,6 +443,11 @@ static void bch2_cached_btree_node_to_text(struct printbuf *out, struct bch_fs * bch2_flags_to_text(out, bch2_btree_node_flags, b->flags); pr_newline(out); + pr_buf(out, "pcpu read locks: "); + pr_tab(out); + pr_buf(out, "%u", b->c.lock.readers != NULL); + pr_newline(out); + pr_buf(out, "written:"); pr_tab(out); pr_buf(out, "%u", b->written); |