bcachefs: Use bkey_eq instead of bpos_eq
PATCH 1/2 bcachefs: Use bkey_eq instead of bpos_eq
Since we are using bpos_nosnap_successor, it's more reasonable to use bkey_eq instead of bpos_eq.
Signed-off-by Alan Huang <[email protected]>
--- fs/bcachefs/alloc_background.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/alloc_background.c +1 -1
@@ -1057,7 +1057,7 @@ static struct bkey_s_c bch2_get_key_or_hole(struct btree_trans *trans, struct btbch2_trans_copy_iter (trans, &iter2, iter);struct btree_path *path =btree_iter_path (trans, iter); -if (!bpos_eq (path->l[0 ].b->key.k.p,SPOS_MAX )) +if (!bkey_eq (path->l[0 ].b->key.k.p,POS_MAX )) end =bkey_min (end,bpos_nosnap_successor (path->l[0 ].b->key.k.p)); end =bkey_min (end,POS (iter->pos.inode, iter->pos.offset +U32_MAX -1 ));
Signature · 1 line
2.48.1
PATCH 2/2 bcachefs: Early return to avoid unnecessary lock
Signed-off-by Alan Huang <[email protected]>
--- fs/bcachefs/alloc_background.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/bcachefs/alloc_background.c +6 -7
@@ -2585,19 +2585,18 @@ u64 bch2_min_rw_member_capacity(struct bch_fs *c)static bool bch2_dev_has_open_write_point (struct bch_fs *c,struct bch_dev *ca) {struct open_bucket *ob; -bool ret = false;for (ob = c->open_buckets; ob < c->open_buckets +ARRAY_SIZE (c->open_buckets); ob++) { -spin_lock (&ob->lock); -if (ob->valid && !ob->on_partial_list && - ob->dev == ca->dev_idx) - ret = true; -spin_unlock (&ob->lock); + scoped_guard(spinlock, &ob->lock) { +if (ob->valid && !ob->on_partial_list && + ob->dev == ca->dev_idx) +return true; + } } -return ret; +return false; }void bch2_dev_allocator_set_rw (struct bch_fs *c,struct bch_dev *ca,bool rw)
Signature · 1 line
2.48.1
Kent Overstreet
AppliedRe: [PATCH 2/2] bcachefs: Early return to avoid unnecessary lock
Quoted 1 line · Alan Huang
Signed-off-by Alan Huang <[email protected]>
Applied
Quoted 37 lines
--- fs/bcachefs/alloc_background.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)fs/bcachefs/alloc_background.c +6
-7@@ -2585,19 +2585,18 @@ u64 bch2_min_rw_member_capacity(struct bch_fs *c)static bool bch2_dev_has_open_write_point (struct bch_fs *c,struct bch_dev *ca) {struct open_bucket *ob; -bool ret = false;for (ob = c->open_buckets; ob < c->open_buckets +ARRAY_SIZE (c->open_buckets); ob++) { -spin_lock (&ob->lock); -if (ob->valid && !ob->on_partial_list && - ob->dev == ca->dev_idx) - ret = true; -spin_unlock (&ob->lock); + scoped_guard(spinlock, &ob->lock) { +if (ob->valid && !ob->on_partial_list && + ob->dev == ca->dev_idx) +return true; + } } -return ret; +return false; }void bch2_dev_allocator_set_rw (struct bch_fs *c,struct bch_dev *ca,bool rw)Signature · 1 line
2.48.1