From: Kent Overstreet Date: Sat, 21 Sep 2019 19:29:34 +0000 (-0400) Subject: bcachefs: Update path microoptimizations X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fdfab313b65080bc938b79998e61af7399e2ba58;p=linux.git bcachefs: Update path microoptimizations Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_locking.h b/fs/bcachefs/btree_locking.h index 6591da0a52b37..aa5882cc48528 100644 --- a/fs/bcachefs/btree_locking.h +++ b/fs/bcachefs/btree_locking.h @@ -211,7 +211,7 @@ static inline void bch2_btree_node_lock_write(struct btree *b, struct btree_iter EBUG_ON(iter->l[b->c.level].b != b); EBUG_ON(iter->l[b->c.level].lock_seq != b->c.lock.state.seq); - if (!six_trylock_write(&b->c.lock)) + if (unlikely(!six_trylock_write(&b->c.lock))) __bch2_btree_node_lock_write(b, iter); } diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 0b3eed506c2c8..a0a59cd496a31 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -44,7 +44,7 @@ inline void bch2_btree_node_lock_for_insert(struct bch_fs *c, struct btree *b, { bch2_btree_node_lock_write(b, iter); - if (btree_node_just_written(b) && + if (unlikely(btree_node_just_written(b)) && bch2_btree_post_write_cleanup(c, b)) bch2_btree_iter_reinit_node(iter, b); @@ -605,8 +605,9 @@ static inline int do_btree_insert_at(struct btree_trans *trans, goto out_clear_replicas; } - trans_for_each_update(trans, i) - btree_insert_entry_checks(trans, i); + if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG)) + trans_for_each_update(trans, i) + btree_insert_entry_checks(trans, i); bch2_btree_trans_verify_locks(trans); /*