Update bcachefs sources to 14ce2a2031 bcachefs: fixes for building in userspace

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

diff --git a/libbcachefs/error.h b/libbcachefs/error.h
index 750c676a65d60c647455ef0753ce888c4d23086b..28fe4fceb93a83ba918df360e09894a270eaef03 100644 (file)
--- a/libbcachefs/error.h
+++ b/libbcachefs/error.h
@@ -1,5 +1,5 @@
-#ifndef _BCACHE_ERROR_H
-#define _BCACHE_ERROR_H
+#ifndef _BCACHEFS_ERROR_H
+#define _BCACHEFS_ERROR_H
 
 #include <linux/printk.h>
 
@@ -96,9 +96,10 @@ enum {
 };
 
 enum fsck_err_opts {
-       FSCK_ERR_NO,
-       FSCK_ERR_YES,
-       FSCK_ERR_ASK,
+       FSCK_OPT_EXIT,
+       FSCK_OPT_YES,
+       FSCK_OPT_NO,
+       FSCK_OPT_ASK,
 };
 
 enum fsck_err_ret {
@@ -179,63 +180,32 @@ do {                                                                      \
        _ret;                                                           \
 })
 
-#define bch2_dev_fatal_error(ca, ...)                                  \
-do {                                                                   \
-       bch_err(ca, __VA_ARGS__);                                       \
-       bch2_fatal_error(c);                                            \
-} while (0)
-
-#define bch2_dev_fatal_io_error(ca, fmt, ...)                          \
-do {                                                                   \
-       printk_ratelimited(KERN_ERR bch2_fmt((ca)->fs,                  \
-               "fatal IO error on %s for " fmt),                       \
-               (ca)->name, ##__VA_ARGS__);                             \
-       bch2_fatal_error((ca)->fs);                                     \
-} while (0)
-
-#define bch2_dev_fatal_io_err_on(cond, ca, ...)                                \
-({                                                                     \
-       int _ret = !!(cond);                                            \
-                                                                       \
-       if (_ret)                                                       \
-               bch2_dev_fatal_io_error(ca, __VA_ARGS__);               \
-       _ret;                                                           \
-})
-
 /*
- * Nonfatal IO errors: either recoverable metadata IO (because we have
- * replicas), or data IO - we need to log it and print out a message, but we
- * don't (necessarily) want to shut down the fs:
+ * IO errors: either recoverable metadata IO (because we have replicas), or data
+ * IO - we need to log it and print out a message, but we don't (necessarily)
+ * want to shut down the fs:
  */
 
-void bch2_nonfatal_io_error_work(struct work_struct *);
+void bch2_io_error_work(struct work_struct *);
 
 /* Does the error handling without logging a message */
-void bch2_nonfatal_io_error(struct bch_dev *);
-
-#if 0
-#define bch2_fs_nonfatal_io_error(c, ...)                              \
-do {                                                                   \
-       bch_err(c, __VA_ARGS__);                                        \
-       bch2_nonfatal_io_error(c);                                      \
-} while (0)
-#endif
+void bch2_io_error(struct bch_dev *);
 
 /* Logs message and handles the error: */
-#define bch2_dev_nonfatal_io_error(ca, fmt, ...)                               \
+#define bch2_dev_io_error(ca, fmt, ...)                                        \
 do {                                                                   \
        printk_ratelimited(KERN_ERR bch2_fmt((ca)->fs,                  \
                "IO error on %s for " fmt),                             \
                (ca)->name, ##__VA_ARGS__);                             \
-       bch2_nonfatal_io_error(ca);                                     \
+       bch2_io_error(ca);                                              \
 } while (0)
 
-#define bch2_dev_nonfatal_io_err_on(cond, ca, ...)                     \
+#define bch2_dev_io_err_on(cond, ca, ...)                              \
 ({                                                                     \
        bool _ret = (cond);                                             \
                                                                        \
        if (_ret)                                                       \
-               bch2_dev_nonfatal_io_error(ca, __VA_ARGS__);            \
+               bch2_dev_io_error(ca, __VA_ARGS__);                     \
        _ret;                                                           \
 })
 
@@ -248,7 +218,7 @@ do {                                                                        \
 #define bcache_io_error(c, bio, fmt, ...)                              \
 do {                                                                   \
        __bcache_io_error(c, fmt, ##__VA_ARGS__);                       \
-       (bio)->bi_error = -EIO;                                         \
+       (bio)->bi_status = BLK_STS_IOERR;                                       \
 } while (0)
 
-#endif /* _BCACHE_ERROR_H */
+#endif /* _BCACHEFS_ERROR_H */