diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-23 17:39:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-23 18:24:08 -0400 |
| commit | ae43a58d97fc00e31770142da832fb8a249808eb (patch) | |
| tree | 95c8fced05f8054eb135b309417415dfa3e5eb18 /libbcachefs/btree_cache.c | |
| parent | 188b6d0c8ef1c02462a744b176557c27220112c9 (diff) | |
Update bcachefs sources to 70fa0c1ff4 fixup! bcachefs: Btree key cache improvements
Diffstat (limited to 'libbcachefs/btree_cache.c')
| -rw-r--r-- | libbcachefs/btree_cache.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libbcachefs/btree_cache.c b/libbcachefs/btree_cache.c index 8dd2db41..d1cbf926 100644 --- a/libbcachefs/btree_cache.c +++ b/libbcachefs/btree_cache.c @@ -118,7 +118,9 @@ static int btree_node_data_alloc(struct bch_fs *c, struct btree *b, gfp_t gfp) static struct btree *__btree_node_mem_alloc(struct bch_fs *c, gfp_t gfp) { - struct btree *b = kzalloc(sizeof(struct btree), gfp); + struct btree *b; + + b = kzalloc(sizeof(struct btree), gfp); if (!b) return NULL; @@ -136,7 +138,9 @@ static struct btree *__btree_node_mem_alloc(struct bch_fs *c, gfp_t gfp) struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *c) { struct btree_cache *bc = &c->btree_cache; - struct btree *b = __btree_node_mem_alloc(c, GFP_KERNEL); + struct btree *b; + + b = __btree_node_mem_alloc(c, GFP_KERNEL); if (!b) return NULL; @@ -155,6 +159,7 @@ struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *c) void bch2_btree_node_hash_remove(struct btree_cache *bc, struct btree *b) { int ret = rhashtable_remove_fast(&bc->table, &b->hash, bch_btree_cache_params); + BUG_ON(ret); /* Cause future lookups for this node to fail: */ |