Skip to content

Commit cecfed9

Browse files
author
Kent Overstreet
committed
bcachefs: Logged op errors should be ignored
If something is wrong with a logged op, we just want to delete it - there's nothing to repair. Signed-off-by: Kent Overstreet <[email protected]>
1 parent 13c1e58 commit cecfed9

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

fs/bcachefs/logged_ops.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,18 @@ static int resume_logged_op(struct btree_trans *trans, struct btree_iter *iter,
3737
const struct bch_logged_op_fn *fn = logged_op_fn(k.k->type);
3838
struct bkey_buf sk;
3939
u32 restart_count = trans->restart_count;
40-
int ret;
4140

4241
if (!fn)
4342
return 0;
4443

4544
bch2_bkey_buf_init(&sk);
4645
bch2_bkey_buf_reassemble(&sk, c, k);
4746

48-
ret = drop_locks_do(trans, (bch2_fs_lazy_rw(c), 0)) ?:
49-
fn->resume(trans, sk.k) ?: trans_was_restarted(trans, restart_count);
47+
fn->resume(trans, sk.k);
5048

5149
bch2_bkey_buf_exit(&sk, c);
52-
return ret;
50+
51+
return trans_was_restarted(trans, restart_count);
5352
}
5453

5554
int bch2_resume_logged_ops(struct bch_fs *c)

0 commit comments

Comments
 (0)