X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs.h;h=17e8eef3d9998d037c2787e2c431647e5e17e933;hb=6ac37db8415c636607d878c16af8346df55668f4;hp=7cdbf69622548aa9f88bf982a65756a6673c8ef0;hpb=8ba5e814fd3d0e9559adca72f73202a7dc304acc;p=bcachefs-tools-debian

diff --git a/libbcachefs.h b/libbcachefs.h
index 7cdbf69..17e8eef 100644
--- a/libbcachefs.h
+++ b/libbcachefs.h
@@ -35,7 +35,6 @@ struct format_opts {
 	uuid_le		uuid;
 	unsigned	version;
 	unsigned	superblock_size;
-	unsigned	encoded_extent_max;
 	bool		encrypted;
 	char		*passphrase;
 };
@@ -45,16 +44,15 @@ static inline struct format_opts format_opts_default()
 	return (struct format_opts) {
 		.version		= bcachefs_metadata_version_current,
 		.superblock_size	= SUPERBLOCK_SIZE_DEFAULT,
-		.encoded_extent_max	= 128,
 	};
 }
 
 struct dev_opts {
 	int		fd;
 	char		*path;
-	u64		size; /* 512 byte sectors */
-	unsigned	bucket_size;
-	const char	*group;
+	u64		size;		/* bytes*/
+	u64		bucket_size;	/* bytes */
+	const char	*label;
 	unsigned	data_allowed;
 	unsigned	durability;
 	bool		discard;
@@ -81,8 +79,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 +237,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);