Update bcachefs sources to 50847e296b34 bcachefs: Check subvol <-> inode pointers...

[bcachefs-tools-debian] / libbcachefs / sb-errors.c

diff --git a/libbcachefs/sb-errors.c b/libbcachefs/sb-errors.c
index 9215d414b5253c81aa9cd6ee48eb214afa354164..5f5bcae391fb9fcde0d306870adbb6779e06cda1 100644 (file)
--- a/libbcachefs/sb-errors.c
+++ b/libbcachefs/sb-errors.c
@@ -4,7 +4,7 @@
 #include "sb-errors.h"
 #include "super-io.h"
 
-static const char * const bch2_sb_error_strs[] = {
+const char * const bch2_sb_error_strs[] = {
 #define x(t, n, ...) [n] = #t,
        BCH_SB_ERRS()
        NULL
@@ -20,9 +20,7 @@ static void bch2_sb_error_id_to_text(struct printbuf *out, enum bch_sb_error_id
 
 static inline unsigned bch2_sb_field_errors_nr_entries(struct bch_sb_field_errors *e)
 {
-       return e
-               ? (bch2_sb_field_bytes(&e->field) - sizeof(*e)) / sizeof(e->entries[0])
-               : 0;
+       return bch2_sb_field_nr_entries(e);
 }
 
 static inline unsigned bch2_sb_field_errors_u64s(unsigned nr)
@@ -70,7 +68,7 @@ static void bch2_sb_errors_to_text(struct printbuf *out, struct bch_sb *sb,
                prt_tab(out);
                prt_u64(out, BCH_SB_ERROR_ENTRY_NR(&e->entries[i]));
                prt_tab(out);
-               bch2_prt_date_seconds(out, le64_to_cpu(e->entries[i].last_error_time));
+               bch2_prt_datetime(out, le64_to_cpu(e->entries[i].last_error_time));
                prt_newline(out);
        }
 }