diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-27 11:00:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-27 17:59:22 -0400 |
| commit | 9bb2977a1ad31a61e080da0bd32000f5cdbc62a0 (patch) | |
| tree | bc6f287bb200df3d3e2e0cc567ef8f33600f457e /libbcachefs/btree_key_cache.c | |
| parent | 5a3011c48e7fd21db08da1ece1de2461ea2b8e21 (diff) | |
Update bcachefs sources to 45845c32a41a fs: bcachefs: add missing MODULE_DESCRIPTION()
Diffstat (limited to 'libbcachefs/btree_key_cache.c')
| -rw-r--r-- | libbcachefs/btree_key_cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbcachefs/btree_key_cache.c b/libbcachefs/btree_key_cache.c index 75f5e6fe..34056aae 100644 --- a/libbcachefs/btree_key_cache.c +++ b/libbcachefs/btree_key_cache.c @@ -424,16 +424,16 @@ static int btree_key_cache_fill(struct btree_trans *trans, goto err; } - if (!bch2_btree_node_relock(trans, ck_path, 0)) { + ret = bch2_trans_relock(trans); + if (ret) { kfree(new_k); - trace_and_count(trans->c, trans_restart_relock_key_cache_fill, trans, _THIS_IP_, ck_path); - ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_fill); goto err; } - ret = bch2_trans_relock(trans); - if (ret) { + if (!bch2_btree_node_relock(trans, ck_path, 0)) { kfree(new_k); + trace_and_count(trans->c, trans_restart_relock_key_cache_fill, trans, _THIS_IP_, ck_path); + ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_fill); goto err; } } |