Update bcachefs sources to dab31ca168 bcachefs: Add some logging for btree node rewri...

[bcachefs-tools-debian] / libbcachefs.h

diff --git a/libbcachefs.h b/libbcachefs.h
index ab4f0cd67fa079306a89c71cc34f059d55c8308c..4bb51bd89e45bddfd15fe51c9f40645e687c1883 100644 (file)
--- a/libbcachefs.h
+++ b/libbcachefs.h
@@ -41,8 +41,12 @@ struct format_opts {
 
 static inline struct format_opts format_opts_default()
 {
+       unsigned version = !access(   "/sys/module/bcachefs/parameters/version", R_OK)
+           ? read_file_u64(AT_FDCWD, "/sys/module/bcachefs/parameters/version")
+           : bcachefs_metadata_version_current;
+
        return (struct format_opts) {
-               .version                = bcachefs_metadata_version_current,
+               .version                = version,
                .superblock_size        = SUPERBLOCK_SIZE_DEFAULT,
        };
 }
@@ -79,8 +83,6 @@ struct bch_sb *bch2_format(struct bch_opt_strs,
 void bch2_super_write(int, struct bch_sb *);
 struct bch_sb *__bch2_super_read(int, u64);
 
-void bch2_sb_print(struct bch_sb *, bool, unsigned, enum units);
-
 /* ioctl interface: */
 
 int bcachectl_open(void);
@@ -239,7 +241,7 @@ struct dev_name {
        char            *label;
        uuid_le         uuid;
 };
-typedef darray(struct dev_name) dev_names;
+typedef DARRAY(struct dev_name) dev_names;
 
 dev_names bchu_fs_get_devices(struct bchfs_handle);