Loading fs/bcachefs/logged_ops.c +3 −4 Original line number Diff line number Diff line Loading @@ -37,7 +37,6 @@ static int resume_logged_op(struct btree_trans *trans, struct btree_iter *iter, const struct bch_logged_op_fn *fn = logged_op_fn(k.k->type); struct bkey_buf sk; u32 restart_count = trans->restart_count; int ret; if (!fn) return 0; Loading @@ -45,11 +44,11 @@ static int resume_logged_op(struct btree_trans *trans, struct btree_iter *iter, bch2_bkey_buf_init(&sk); bch2_bkey_buf_reassemble(&sk, c, k); ret = drop_locks_do(trans, (bch2_fs_lazy_rw(c), 0)) ?: fn->resume(trans, sk.k) ?: trans_was_restarted(trans, restart_count); fn->resume(trans, sk.k); bch2_bkey_buf_exit(&sk, c); return ret; return trans_was_restarted(trans, restart_count); } int bch2_resume_logged_ops(struct bch_fs *c) Loading Loading
fs/bcachefs/logged_ops.c +3 −4 Original line number Diff line number Diff line Loading @@ -37,7 +37,6 @@ static int resume_logged_op(struct btree_trans *trans, struct btree_iter *iter, const struct bch_logged_op_fn *fn = logged_op_fn(k.k->type); struct bkey_buf sk; u32 restart_count = trans->restart_count; int ret; if (!fn) return 0; Loading @@ -45,11 +44,11 @@ static int resume_logged_op(struct btree_trans *trans, struct btree_iter *iter, bch2_bkey_buf_init(&sk); bch2_bkey_buf_reassemble(&sk, c, k); ret = drop_locks_do(trans, (bch2_fs_lazy_rw(c), 0)) ?: fn->resume(trans, sk.k) ?: trans_was_restarted(trans, restart_count); fn->resume(trans, sk.k); bch2_bkey_buf_exit(&sk, c); return ret; return trans_was_restarted(trans, restart_count); } int bch2_resume_logged_ops(struct bch_fs *c) Loading