bcachefs: errcode cleanup: journal errors

Instead of throwing standard error codes, we should be throwing
dedicated private error codes, this greatly improves debugability.

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

diff --git a/fs/bcachefs/errcode.h b/fs/bcachefs/errcode.h
index 131b9bef21a0d8b23b3e0e0abb7b17515d67f678..c989ce4f715fa1018f9b227c16559a4c74e892f5 100644 (file)
--- a/fs/bcachefs/errcode.h
+++ b/fs/bcachefs/errcode.h
@@ -241,6 +241,8 @@
        x(BCH_ERR_invalid_sb,           invalid_sb_downgrade)                   \
        x(BCH_ERR_invalid,              invalid_bkey)                           \
        x(BCH_ERR_operation_blocked,    nocow_lock_blocked)                     \
+       x(EIO,                          journal_shutdown)                       \
+       x(EIO,                          journal_flush_err)                      \
        x(EIO,                          btree_node_read_err)                    \
        x(BCH_ERR_btree_node_read_err,  btree_node_read_err_cached)             \
        x(EIO,                          sb_not_downgraded)                      \

diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index 699db0d0749acd10e0dba963c04ad2db1c843b5b..bbdd0b17ae690c30e30abdb86320bcf49e549cd0 100644 (file)
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -673,7 +673,7 @@ out:
  * @seq:       seq to flush
  * @parent:    closure object to wait with
  * Returns:    1 if @seq has already been flushed, 0 if @seq is being flushed,
- *             -EIO if @seq will never be flushed
+ *             -BCH_ERR_journal_flush_err if @seq will never be flushed
  *
  * Like bch2_journal_wait_on_seq, except that it triggers a write immediately if
  * necessary
@@ -696,7 +696,7 @@ int bch2_journal_flush_seq_async(struct journal *j, u64 seq,
 
        /* Recheck under lock: */
        if (j->err_seq && seq >= j->err_seq) {
-               ret = -EIO;
+               ret = -BCH_ERR_journal_flush_err;
                goto out;
        }
 

diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h
index 71a50846967f6d84f2808a6a35ee45a98e6dc4c8..a6a2e888c59bd4c659e9d6930da6754ed625ff03 100644 (file)
--- a/fs/bcachefs/journal.h
+++ b/fs/bcachefs/journal.h
@@ -412,7 +412,7 @@ void bch2_journal_halt(struct journal *);
 static inline int bch2_journal_error(struct journal *j)
 {
        return j->reservations.cur_entry_offset == JOURNAL_ENTRY_ERROR_VAL
-               ? -EIO : 0;
+               ? -BCH_ERR_journal_shutdown : 0;
 }
 
 struct bch_dev;