iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: bch2_trans_relock() only relocks iters that should be locked

Browse Source 
This avoids unexpected lock restarts in bch2_btree_iter_traverse_all().

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2021-07-27 17:58:58 -04:00 committed by Kent Overstreet
parent 6918bb55f6
commit fe5233979a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/bcachefs/btree_iter.c
View File

@ -495,8 +495,7 @@ void bch2_trans_downgrade(struct btree_trans *trans)
/* Btree transaction locking: */
static inline bool btree_iter_should_be_locked(struct btree_trans *trans,
struct btree_iter *iter)
static inline bool btree_iter_should_be_locked(struct btree_iter *iter)
{
return (iter->flags & BTREE_ITER_KEEP_UNTIL_COMMIT) ||
iter->should_be_locked;
@ -507,8 +506,8 @@ bool bch2_trans_relock(struct btree_trans *trans)
struct btree_iter *iter;
trans_for_each_iter(trans, iter)
if (!bch2_btree_iter_relock(iter, _RET_IP_) &&
btree_iter_should_be_locked(trans, iter)) {
if (btree_iter_should_be_locked(iter) &&
!bch2_btree_iter_relock(iter, _RET_IP_)) {
trace_trans_restart_relock(trans->ip, _RET_IP_,
iter->btree_id, &iter->real_pos);
return false;