bcachefs: Convert EROFS errors to private error codes

More error code improvements - this gets us more useful error messages.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index dd47eeb1efc580d4a6fc7acc9cf05df35bb43aac..c4aee0022fab2e34a6f55d49c0fbe0cefe98b2a0 100644 (file)
--- a/fs/bcachefs/alloc_foreground.c
+++ b/fs/bcachefs/alloc_foreground.c
@@ -1222,9 +1222,6 @@ err:
                        ? -EAGAIN
                        : -BCH_ERR_ENOSPC_bucket_alloc;
 
-       if (bch2_err_matches(ret, BCH_ERR_insufficient_devices))
-               return -EROFS;
-
        return ret;
 }
 

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index fdc9de6e9908b2dc8d43f53fd4a266166c79e69e..e43ccf896e8efbedbbd9271d9de85062ec5aa79f 100644 (file)
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -1988,7 +1988,7 @@ int bch2_gc_gens(struct bch_fs *c)
                                        NULL, NULL,
                                        BTREE_INSERT_NOFAIL,
                                gc_btree_gens_key(&trans, &iter, k));
-                       if (ret && ret != -EROFS)
+                       if (ret && !bch2_err_matches(ret, EROFS))
                                bch_err(c, "error recalculating oldest_gen: %s", bch2_err_str(ret));
                        if (ret)
                                goto err;
@@ -2001,7 +2001,7 @@ int bch2_gc_gens(struct bch_fs *c)
                        NULL, NULL,
                        BTREE_INSERT_NOFAIL,
                bch2_alloc_write_oldest_gen(&trans, &iter, k));
-       if (ret && ret != -EROFS)
+       if (ret && !bch2_err_matches(ret, EROFS))
                bch_err(c, "error writing oldest_gen: %s", bch2_err_str(ret));
        if (ret)
                goto err;

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 7a95649dd71ed09063905fb6938790bb3698edbd..f44abb3fe469bea9e1011c1d60a25a2ac5c47406 100644 (file)
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -990,7 +990,7 @@ bch2_trans_commit_get_rw_cold(struct btree_trans *trans)
 
        if (likely(!(trans->flags & BTREE_INSERT_LAZY_RW)) ||
            test_bit(BCH_FS_STARTED, &c->flags))
-               return -EROFS;
+               return -BCH_ERR_erofs_trans_commit;
 
        bch2_trans_unlock(trans);
 

diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c
index 65da4a185bbb1e130742715770fc8475179ab83a..0d33dee1aed4642a0d5e55c2c91608c4f4051d5b 100644 (file)
--- a/fs/bcachefs/ec.c
+++ b/fs/bcachefs/ec.c
@@ -891,7 +891,7 @@ static void ec_stripe_create(struct ec_stripe_new *s)
        closure_sync(&s->iodone);
 
        if (s->err) {
-               if (s->err != -EROFS)
+               if (!bch2_err_matches(s->err, EROFS))
                        bch_err(c, "error creating stripe: error writing data buckets");
                goto err;
        }

diff --git a/fs/bcachefs/errcode.h b/fs/bcachefs/errcode.h
index 5f0f757267842839fcdec8597a5f17ff52f331f0..96ee72c125d6f7279659317ab6e5c0a2740819be 100644 (file)
--- a/fs/bcachefs/errcode.h
+++ b/fs/bcachefs/errcode.h
@@ -20,7 +20,6 @@
        x(0,                            open_buckets_empty)                     \
        x(0,                            freelist_empty)                         \
        x(BCH_ERR_freelist_empty,       no_buckets_found)                       \
-       x(0,                            insufficient_devices)                   \
        x(0,                            transaction_restart)                    \
        x(BCH_ERR_transaction_restart,  transaction_restart_fault_inject)       \
        x(BCH_ERR_transaction_restart,  transaction_restart_relock)             \
@@ -80,6 +79,11 @@
        x(EINVAL,                       device_already_online)                  \
        x(EINVAL,                       insufficient_devices_to_start)          \
        x(EINVAL,                       invalid)                                \
+       x(EROFS,                        erofs_trans_commit)                     \
+       x(EROFS,                        erofs_no_writes)                        \
+       x(EROFS,                        erofs_journal_err)                      \
+       x(EROFS,                        erofs_sb_err)                           \
+       x(EROFS,                        insufficient_devices)                   \
        x(BCH_ERR_invalid,              invalid_sb)                             \
        x(BCH_ERR_invalid_sb,           invalid_sb_magic)                       \
        x(BCH_ERR_invalid_sb,           invalid_sb_version)                     \

diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index 27265ba35fac4e9188a624cc2afd068b3e7662e7..44f3719d4b71305351caa048521e7ba4bd179618 100644 (file)
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -1417,7 +1417,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;
        }
 

diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index c7a7b9cd20f0603171d13d6b75f70eccb5df0cdc..9daa99f3732a8dfc4501b775d31eed915309aa1a 100644 (file)
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -363,7 +363,7 @@ retry:
                return 0;
 
        if (bch2_journal_error(j))
-               return -EROFS;
+               return -BCH_ERR_erofs_journal_err;
 
        spin_lock(&j->lock);
 

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index 4d6fd3025e403dee42185bc02dd897a22bb42b18..848a415b6797f3abd8b0c6afd5b4309a3fb37240 100644 (file)
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -251,7 +251,7 @@ static int bch2_move_extent(struct btree_trans *trans,
        }
 
        if (!percpu_ref_tryget_live(&c->writes))
-               return -EROFS;
+               return -BCH_ERR_erofs_no_writes;
 
        /* write path might have to decompress data: */
        bkey_for_each_ptr_decode(k.k, ptrs, p, entry)

diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c
index 66f18f711d533c19ffc342f41f874c1c68f53274..9c55a88a2b08d2fcaaca15f17865459824327b80 100644 (file)
--- a/fs/bcachefs/movinggc.c
+++ b/fs/bcachefs/movinggc.c
@@ -319,7 +319,7 @@ static int bch2_copygc(struct bch_fs *c)
                             writepoint_ptr(&c->copygc_write_point),
                             false,
                             copygc_pred, NULL);
-       if (ret < 0 && ret != -EROFS)
+       if (ret < 0 && !bch2_err_matches(ret, EROFS))
                bch_err(c, "error from bch2_move_data() in copygc: %s", bch2_err_str(ret));
        if (ret)
                return ret;

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index d054e83d86efc571c2e6998ca4ecece08559cd6a..80736be21b9f93dcb64dc8f274dce996e0d300d8 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -631,8 +631,8 @@ static int bch2_journal_replay(struct bch_fs *c, u64 start_seq, u64 end_seq)
                                     : 0),
                             bch2_journal_replay_key(&trans, k));
                if (ret) {
-                       bch_err(c, "journal replay: error %d while replaying key at btree %s level %u",
-                               ret, bch2_btree_ids[k->btree_id], k->level);
+                       bch_err(c, "journal replay: error while replaying key at btree %s level %u: %s",
+                               bch2_btree_ids[k->btree_id], k->level, bch2_err_str(ret));
                        goto err;
                }
        }

diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c
index 8c426d6440c96989b97d5a47d1a88f3164e2d015..08c98ac03c130bfe82af5ae1a71164324958ca3b 100644 (file)
--- a/fs/bcachefs/reflink.c
+++ b/fs/bcachefs/reflink.c
@@ -283,7 +283,7 @@ s64 bch2_remap_range(struct bch_fs *c,
        int ret = 0, ret2 = 0;
 
        if (!percpu_ref_tryget_live(&c->writes))
-               return -EROFS;
+               return -BCH_ERR_erofs_no_writes;
 
        bch2_check_set_feature(c, BCH_FEATURE_reflink);
 

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index 8dfe92d7eb771b1537a4073e10a25cd5d5f105c4..ff27ae1839a8f08e05aefc27f6ea94a69eea949a 100644 (file)
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -868,7 +868,7 @@ int bch2_write_super(struct bch_fs *c)
                                le64_to_cpu(ca->sb_read_scratch->seq),
                                ca->disk_sb.seq);
                        percpu_ref_put(&ca->io_ref);
-                       ret = -EROFS;
+                       ret = -BCH_ERR_erofs_sb_err;
                        goto out;
                }
 
@@ -878,7 +878,7 @@ int bch2_write_super(struct bch_fs *c)
                                le64_to_cpu(ca->sb_read_scratch->seq),
                                ca->disk_sb.seq);
                        percpu_ref_put(&ca->io_ref);
-                       ret = -EROFS;
+                       ret = -BCH_ERR_erofs_sb_err;
                        goto out;
                }
        }