Update bcachefs sources to 9d554fa16d bcachefs: Add .to_text() methods for all superb...

[bcachefs-tools-debian] / libbcachefs / super-io.h

diff --git a/libbcachefs/super-io.h b/libbcachefs/super-io.h
index 7d09d8e45816b7f2ce19aed6bcfa7504d1f1909a..50f31a3b9b1845208a23921f32f2db9a71389006 100644 (file)
--- a/libbcachefs/super-io.h
+++ b/libbcachefs/super-io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_SUPER_IO_H
 #define _BCACHEFS_SUPER_IO_H
 
@@ -11,6 +12,7 @@
 struct bch_sb_field *bch2_sb_field_get(struct bch_sb *, enum bch_sb_field_type);
 struct bch_sb_field *bch2_sb_field_resize(struct bch_sb_handle *,
                                          enum bch_sb_field_type, unsigned);
+void bch2_sb_field_delete(struct bch_sb_handle *, enum bch_sb_field_type);
 
 #define field_to_type(_f, _name)                                       \
        container_of_or_null(_f, struct bch_sb_field_##_name, field)
@@ -36,31 +38,10 @@ BCH_SB_FIELDS()
 extern const char * const bch2_sb_fields[];
 
 struct bch_sb_field_ops {
-       const char *    (*validate)(struct bch_sb *, struct bch_sb_field *);
-       size_t          (*to_text)(char *, size_t, struct bch_sb *,
-                                  struct bch_sb_field *);
+       int     (*validate)(struct bch_sb *, struct bch_sb_field *, struct printbuf *);
+       void    (*to_text)(struct printbuf *, struct bch_sb *, struct bch_sb_field *);
 };
 
-static inline bool bch2_sb_test_feature(struct bch_sb *sb,
-                                       enum bch_sb_features f)
-{
-       unsigned w = f / 64;
-       unsigned b = f % 64;
-
-       return le64_to_cpu(sb->features[w]) & (1ULL << b);
-}
-
-static inline void bch2_sb_set_feature(struct bch_sb *sb,
-                                      enum bch_sb_features f)
-{
-       if (!bch2_sb_test_feature(sb, f)) {
-               unsigned w = f / 64;
-               unsigned b = f % 64;
-
-               le64_add_cpu(&sb->features[w], 1ULL << b);
-       }
-}
-
 static inline __le64 bch2_sb_magic(struct bch_fs *c)
 {
        __le64 ret;
@@ -84,10 +65,15 @@ int bch2_sb_from_fs(struct bch_fs *, struct bch_dev *);
 void bch2_free_super(struct bch_sb_handle *);
 int bch2_sb_realloc(struct bch_sb_handle *, unsigned);
 
-const char *bch2_sb_validate(struct bch_sb_handle *);
-
 int bch2_read_super(const char *, struct bch_opts *, struct bch_sb_handle *);
-void bch2_write_super(struct bch_fs *);
+int bch2_write_super(struct bch_fs *);
+void __bch2_check_set_feature(struct bch_fs *, unsigned);
+
+static inline void bch2_check_set_feature(struct bch_fs *c, unsigned feat)
+{
+       if (!(c->sb.features & (1ULL << feat)))
+               __bch2_check_set_feature(c, feat);
+}
 
 /* BCH_SB_FIELD_journal: */
 
@@ -121,7 +107,6 @@ static inline struct bch_member_cpu bch2_mi_to_cpu(struct bch_member *mi)
                .bucket_size    = le16_to_cpu(mi->bucket_size),
                .group          = BCH_MEMBER_GROUP(mi),
                .state          = BCH_MEMBER_STATE(mi),
-               .replacement    = BCH_MEMBER_REPLACEMENT(mi),
                .discard        = BCH_MEMBER_DISCARD(mi),
                .data_allowed   = BCH_MEMBER_DATA_ALLOWED(mi),
                .durability     = BCH_MEMBER_DURABILITY(mi)
@@ -133,9 +118,17 @@ static inline struct bch_member_cpu bch2_mi_to_cpu(struct bch_member *mi)
 
 /* BCH_SB_FIELD_clean: */
 
-void bch2_fs_mark_clean(struct bch_fs *, bool);
+void bch2_journal_super_entries_add_common(struct bch_fs *,
+                                          struct jset_entry **, u64);
+
+int bch2_sb_clean_validate_late(struct bch_fs *, struct bch_sb_field_clean *, int);
+
+int bch2_fs_mark_dirty(struct bch_fs *);
+void bch2_fs_mark_clean(struct bch_fs *);
 
-size_t bch2_sb_field_to_text(char *, size_t, struct bch_sb *,
-                            struct bch_sb_field *);
+void bch2_sb_field_to_text(struct printbuf *, struct bch_sb *,
+                          struct bch_sb_field *);
+void bch2_sb_layout_to_text(struct printbuf *, struct bch_sb_layout *);
+void bch2_sb_to_text(struct printbuf *, struct bch_sb *, bool, unsigned);
 
 #endif /* _BCACHEFS_SUPER_IO_H */