diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-04-03 16:47:22 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-04-03 17:34:02 -0400 |
commit | 5639fb38cabaa326b8b664d874a46509d4a60bf2 (patch) | |
tree | 3f3aa73ebc9505bede820ce02d7e8a9bad7dfa08 /libbcachefs/logged_ops.c | |
parent | 9f4ed5ce05888b62d1e4417323c553e5d06f4abf (diff) |
Update bcachefs sources to 09d4c2acbf4c bcachefs: reconstruct_inode()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/logged_ops.c')
-rw-r--r-- | libbcachefs/logged_ops.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libbcachefs/logged_ops.c b/libbcachefs/logged_ops.c index 9fac838d..b82f8209 100644 --- a/libbcachefs/logged_ops.c +++ b/libbcachefs/logged_ops.c @@ -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; @@ -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) |