diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-10-28 19:35:13 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:30 -0400 |
| commit | b7ba66c8450a58649393b47bc8975926b1e80814 (patch) | |
| tree | 995a557869e367e2d60bb5adeac4ffceab4dcca7 /fs/bcachefs/btree_update_interior.h | |
| parent | ff929515cc52ed693ff2116be3af9f32122e9b54 (diff) | |
| download | linux-stable-b7ba66c8450a58649393b47bc8975926b1e80814.tar.gz linux-stable-b7ba66c8450a58649393b47bc8975926b1e80814.tar.bz2 linux-stable-b7ba66c8450a58649393b47bc8975926b1e80814.zip | |
bcachefs: Inline more of bch2_trans_commit hot path
The main optimization here is that if we let
bch2_replicas_delta_list_apply() fail, we can completely skip calling
bch2_bkey_replicas_marked_locked().
And assorted other small optimizations.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_update_interior.h')
| -rw-r--r-- | fs/bcachefs/btree_update_interior.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_update_interior.h b/fs/bcachefs/btree_update_interior.h index f9e092bf69aa..85f1320fa7b1 100644 --- a/fs/bcachefs/btree_update_interior.h +++ b/fs/bcachefs/btree_update_interior.h @@ -284,17 +284,17 @@ static inline unsigned btree_write_set_buffer(struct btree *b) static inline struct btree_node_entry *want_new_bset(struct bch_fs *c, struct btree *b) { - struct bset *i = btree_bset_last(b); + struct bset_tree *t = bset_tree_last(b); struct btree_node_entry *bne = max(write_block(b), (void *) btree_bkey_last(b, bset_tree_last(b))); ssize_t remaining_space = __bch_btree_u64s_remaining(c, b, &bne->keys.start[0]); - if (unlikely(bset_written(b, i))) { + if (unlikely(bset_written(b, bset(b, t)))) { if (remaining_space > (ssize_t) (block_bytes(c) >> 3)) return bne; } else { - if (unlikely(vstruct_bytes(i) > btree_write_set_buffer(b)) && + if (unlikely(bset_u64s(t) * sizeof(u64) > btree_write_set_buffer(b)) && remaining_space > (ssize_t) (btree_write_set_buffer(b) >> 3)) return bne; } |