diff options
Diffstat (limited to 'fs/bcachefs/io_read.c')
| -rw-r--r-- | fs/bcachefs/io_read.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/bcachefs/io_read.c b/fs/bcachefs/io_read.c index e7d53ab1cf55..330db82aba8b 100644 --- a/fs/bcachefs/io_read.c +++ b/fs/bcachefs/io_read.c @@ -408,9 +408,8 @@ void bch2_promote_op_to_text(struct printbuf *out, { if (!op->write.read_done) { prt_printf(out, "parent read: %px\n", op->write.rbio.parent); - printbuf_indent_add(out, 2); + guard(printbuf_indent)(out); bch2_read_bio_to_text(out, c, op->write.rbio.parent); - printbuf_indent_sub(out, 2); } bch2_data_update_to_text(out, &op->write); @@ -1076,8 +1075,10 @@ int __bch2_read_extent(struct btree_trans *trans, struct bch_read_bio *orig, } if ((bch2_bkey_extent_flags(k) & BIT_ULL(BCH_EXTENT_FLAG_poisoned)) && - !orig->data_update) - return bch_err_throw(c, extent_poisoned); + !orig->data_update) { + ret = bch_err_throw(c, extent_poisoned); + goto err; + } retry_pick: ret = bch2_bkey_pick_read_device(c, k, failed, &pick, dev); @@ -1517,7 +1518,7 @@ void bch2_read_bio_to_text(struct printbuf *out, /* Are we in a retry? */ - printbuf_indent_add(out, 2); + guard(printbuf_indent)(out); u64 now = local_clock(); prt_printf(out, "start_time:\t"); @@ -1551,7 +1552,6 @@ void bch2_read_bio_to_text(struct printbuf *out, prt_newline(out); bch2_bio_to_text(out, &rbio->bio); - printbuf_indent_sub(out, 2); } void bch2_fs_io_read_exit(struct bch_fs *c) |