Update bcachefs sources to 84505cfd37 bcachefs: Go RW before check_alloc_info()

[bcachefs-tools-debian] / libbcachefs / io.c

diff --git a/libbcachefs/io.c b/libbcachefs/io.c
index f0fca861b90122f7882af40ac9ba86d4b1e9a170..706f18bc4238373a758998b30064ad7d702a478e 100644 (file)
--- a/libbcachefs/io.c
+++ b/libbcachefs/io.c
@@ -427,7 +427,7 @@ retry:
                                opts.data_replicas,
                                opts.data_replicas,
                                RESERVE_none, 0, &cl, &wp);
-               if (ret == -EAGAIN) {
+               if (bch2_err_matches(ret, BCH_ERR_operation_blocked)) {
                        bch2_trans_unlock(trans);
                        closure_sync(&cl);
                        goto retry;
@@ -1627,7 +1627,7 @@ again:
                                              BCH_WRITE_ONLY_SPECIFIED_DEVS))
                                ? NULL : &op->cl, &wp));
                if (unlikely(ret)) {
-                       if (ret == -EAGAIN)
+                       if (bch2_err_matches(ret, BCH_ERR_operation_blocked))
                                break;
 
                        goto err;
@@ -1775,7 +1775,7 @@ void bch2_write(struct closure *cl)
 
        if (c->opts.nochanges ||
            !percpu_ref_tryget_live(&c->writes)) {
-               op->error = -EROFS;
+               op->error = -BCH_ERR_erofs_no_writes;
                goto err;
        }