diff options
Diffstat (limited to 'libbcachefs/btree_locking.c')
-rw-r--r-- | libbcachefs/btree_locking.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/btree_locking.c b/libbcachefs/btree_locking.c index 93a6ebed..9d090437 100644 --- a/libbcachefs/btree_locking.c +++ b/libbcachefs/btree_locking.c @@ -274,7 +274,7 @@ next: b = &READ_ONCE(path->l[top->level].b)->c; - if (unlikely(IS_ERR_OR_NULL(b))) { + if (IS_ERR_OR_NULL(b)) { BUG_ON(!lock_graph_remove_non_waiters(&g)); goto next; } @@ -605,7 +605,7 @@ int bch2_trans_relock(struct btree_trans *trans) struct btree_path *path; if (unlikely(trans->restarted)) - return - ((int) trans->restarted); + return -((int) trans->restarted); trans_for_each_path(trans, path) if (path->should_be_locked && |