From 1f79cf3825e94fcb146d417b6dda9b94c93c7a53 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 30 Dec 2023 22:54:04 -0500 Subject: Update bcachefs sources to 2a6125decb43 bcachefs: bch_sb_field_downgrade Signed-off-by: Kent Overstreet --- libbcachefs/sb-errors.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libbcachefs/sb-errors.c') diff --git a/libbcachefs/sb-errors.c b/libbcachefs/sb-errors.c index f0930ab7..5f5bcae3 100644 --- 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) -- cgit v1.2.3