X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs.h;h=4bb51bd89e45bddfd15fe51c9f40645e687c1883;hb=a3eb6ad8ef34368cbe2da8a39d9749ed6e7cb4e0;hp=30add92c518c4ceae328048b5318b96220f0278a;hpb=7d2baabdb15a564a89443614f5c6ad1205164943;p=bcachefs-tools-debian

diff --git a/libbcachefs.h b/libbcachefs.h
index 30add92..4bb51bd 100644
--- a/libbcachefs.h
+++ b/libbcachefs.h
@@ -12,6 +12,8 @@
 
 /* option parsing */
 
+#define SUPERBLOCK_SIZE_DEFAULT		2048	/* 1 MB */
+
 struct bch_opt_strs {
 union {
 	char			*by_id[bch2_opts_nr];
@@ -23,6 +25,7 @@ struct {
 };
 };
 
+void bch2_opt_strs_free(struct bch_opt_strs *);
 struct bch_opt_strs bch2_cmdline_opts_get(int *, char *[], unsigned);
 struct bch_opts bch2_parse_opts(struct bch_opt_strs);
 void bch2_opts_usage(unsigned);
@@ -30,26 +33,30 @@ void bch2_opts_usage(unsigned);
 struct format_opts {
 	char		*label;
 	uuid_le		uuid;
-
-	unsigned	encoded_extent_max;
-
+	unsigned	version;
+	unsigned	superblock_size;
 	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) {
-		.encoded_extent_max	= 128,
+		.version		= version,
+		.superblock_size	= SUPERBLOCK_SIZE_DEFAULT,
 	};
 }
 
 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;
@@ -76,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);
@@ -90,7 +95,8 @@ struct bchfs_handle {
 
 void bcache_fs_close(struct bchfs_handle);
 struct bchfs_handle bcache_fs_open(const char *);
-struct bchfs_handle bchu_fs_open_by_dev(const char *, unsigned *);
+struct bchfs_handle bchu_fs_open_by_dev(const char *, int *);
+int bchu_dev_path_to_idx(struct bchfs_handle, const char *);
 
 static inline void bchu_disk_add(struct bchfs_handle fs, char *dev)
 {
@@ -214,6 +220,19 @@ static inline void bchu_disk_resize(struct bchfs_handle fs,
 	xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_RESIZE, &i);
 }
 
+static inline void bchu_disk_resize_journal(struct bchfs_handle fs,
+					    unsigned idx,
+					    u64 nbuckets)
+{
+	struct bch_ioctl_disk_resize i = {
+		.flags	= BCH_BY_INDEX,
+		.dev	= idx,
+		.nbuckets = nbuckets,
+	};
+
+	xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_RESIZE_JOURNAL, &i);
+}
+
 int bchu_data(struct bchfs_handle, struct bch_ioctl_data);
 
 struct dev_name {
@@ -222,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);