New upstream release

[bcachefs-tools-debian] / libbcachefs / error.h

diff --git a/libbcachefs/error.h b/libbcachefs/error.h
index dae72620dae36e4bc8b23298010766f9e2b074c3..7ce9540052e53df99a90d4ac958c671ad375bdc7 100644 (file)
--- a/libbcachefs/error.h
+++ b/libbcachefs/error.h
@@ -73,8 +73,8 @@ do {                                                                  \
 #define bch2_trans_inconsistent(trans, ...)                            \
 ({                                                                     \
        bch_err(trans->c, __VA_ARGS__);                                 \
-       bch2_inconsistent_error(trans->c);                              \
        bch2_dump_trans_updates(trans);                                 \
+       bch2_inconsistent_error(trans->c);                              \
 })
 
 #define bch2_trans_inconsistent_on(cond, trans, ...)                   \
@@ -91,19 +91,14 @@ do {                                                                        \
  * be able to repair:
  */
 
-enum fsck_err_opts {
-       FSCK_OPT_EXIT,
-       FSCK_OPT_YES,
-       FSCK_OPT_NO,
-       FSCK_OPT_ASK,
-};
-
 struct fsck_err_state {
        struct list_head        list;
        const char              *fmt;
        u64                     nr;
        bool                    ratelimited;
-       struct printbuf         buf;
+       int                     ret;
+       int                     fix;
+       char                    *last_msg;
 };
 
 #define FSCK_CAN_FIX           (1 << 0)