]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
bcachefs: fix missing restart handling in bch2_read_retry_nodecode()
authorKent Overstreet <kent.overstreet@linux.dev>
Tue, 15 Oct 2024 03:52:38 +0000 (23:52 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Fri, 18 Oct 2024 04:49:47 +0000 (00:49 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/io_read.c

index e4fc17c548fd556f056c01163a8bbddce3855421..f00beff9ca0efcca7b93ec90402efaf091c06679 100644 (file)
@@ -409,8 +409,8 @@ retry:
        bch2_trans_begin(trans);
        rbio->bio.bi_status = 0;
 
-       k = bch2_btree_iter_peek_slot(&iter);
-       if (bkey_err(k))
+       ret = lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_slot(&iter)));
+       if (ret)
                goto err;
 
        bch2_bkey_buf_reassemble(&sk, c, k);