diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-11-24 11:12:22 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:47 +0300 |
| commit | e88a75ebe86c1df42f0ca9ab6e8fa50db26e7cef (patch) | |
| tree | 3b8608b0ae6e06d405bf6ef63e098416c68830db /fs/bcachefs/io.c | |
| parent | e15382125948523cd5c887c5fe4fa4303e9a9dc1 (diff) | |
| download | linux-e88a75ebe86c1df42f0ca9ab6e8fa50db26e7cef.tar.xz | |
bcachefs: New bpos_cmp(), bkey_cmp() replacements
This patch introduces
- bpos_eq()
- bpos_lt()
- bpos_le()
- bpos_gt()
- bpos_ge()
and equivalent replacements for bkey_cmp().
Looking at the generated assembly these could probably be improved
further, but we already see a significant code size improvement with
this patch.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/io.c')
| -rw-r--r-- | fs/bcachefs/io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 5fe049d64e27..491fad4dfb28 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -237,7 +237,7 @@ int bch2_sum_sector_overwrites(struct btree_trans *trans, (!new_compressed && bch2_bkey_sectors_compressed(old)))) *usage_increasing = true; - if (bkey_cmp(old.k->p, new->k.p) >= 0) { + if (bkey_ge(old.k->p, new->k.p)) { /* * Check if there's already data above where we're * going to be writing to - this means we're definitely @@ -420,7 +420,7 @@ int bch2_fpunch_at(struct btree_trans *trans, struct btree_iter *iter, bch2_btree_iter_set_snapshot(iter, snapshot); k = bch2_btree_iter_peek(iter); - if (bkey_cmp(iter->pos, end_pos) >= 0) { + if (bkey_ge(iter->pos, end_pos)) { bch2_btree_iter_set_pos(iter, end_pos); break; } @@ -518,7 +518,7 @@ static int bch2_write_index_default(struct bch_write_op *op) if (ec_ob) bch2_ob_add_backpointer(c, ec_ob, &sk.k->k); - if (bkey_cmp(iter.pos, k->k.p) >= 0) + if (bkey_ge(iter.pos, k->k.p)) bch2_keylist_pop_front(&op->insert_keys); else bch2_cut_front(iter.pos, k); @@ -1398,7 +1398,7 @@ void bch2_write(struct closure *cl) EBUG_ON(op->cl.parent); BUG_ON(!op->nr_replicas); BUG_ON(!op->write_point.v); - BUG_ON(!bkey_cmp(op->pos, POS_MAX)); + BUG_ON(bkey_eq(op->pos, POS_MAX)); op->start_time = local_clock(); bch2_keylist_init(&op->insert_keys, op->inline_keys); |