X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs.h;h=4bb51bd89e45bddfd15fe51c9f40645e687c1883;hb=20aecb42d8d1c869b17b38b979b9f2f7cbd2ca34;hp=b5f9673f368ee1476ec20e3e86dbc859efdbd5e0;hpb=55e3496d06c9b112f93bb1dea942564f900c2f7d;p=bcachefs-tools-debian

diff --git a/libbcachefs.h b/libbcachefs.h
index b5f9673..4bb51bd 100644
--- a/libbcachefs.h
+++ b/libbcachefs.h
@@ -35,25 +35,27 @@ struct format_opts {
 	uuid_le		uuid;
 	unsigned	version;
 	unsigned	superblock_size;
-	unsigned	encoded_extent_max;
 	bool		encrypted;
 	char		*passphrase;
 };
 
 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,
-		.encoded_extent_max	= 128,
 	};
 }
 
 struct dev_opts {
 	int		fd;
 	char		*path;
-	u64		size; /* 512 byte sectors */
-	unsigned	bucket_size;
+	u64		size;		/* bytes*/
+	u64		bucket_size;	/* bytes */
 	const char	*label;
 	unsigned	data_allowed;
 	unsigned	durability;
@@ -81,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);
@@ -241,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);