/* option parsing */
+#define SUPERBLOCK_SIZE_DEFAULT 2048 /* 1 MB */
+
struct bch_opt_strs {
union {
char *by_id[bch2_opts_nr];
-};
struct {
#define x(_name, ...) char *_name;
BCH_OPTS()
#undef x
};
};
+};
+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);
struct format_opts {
char *label;
- uuid_le uuid;
-
- unsigned encoded_extent_max;
-
+ __uuid_t uuid;
+ 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;
+ struct block_device *bdev;
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;
};
}
-void bch2_pick_bucket_size(struct bch_opts, struct dev_opts *);
+u64 bch2_pick_bucket_size(struct bch_opts, struct dev_opts *);
+void bch2_check_bucket_size(struct bch_opts, struct dev_opts *);
+
struct bch_sb *bch2_format(struct bch_opt_strs,
struct bch_opts,
struct format_opts, struct dev_opts *, size_t);
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);
struct bchfs_handle {
- uuid_le uuid;
- int ioctl_fd;
- int sysfs_fd;
+ __uuid_t uuid;
+ int ioctl_fd;
+ int sysfs_fd;
};
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)
{
xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_SET_STATE, &i);
}
-static inline struct bch_ioctl_usage *bchu_usage(struct bchfs_handle fs)
+static inline struct bch_ioctl_fs_usage *bchu_fs_usage(struct bchfs_handle fs)
{
- struct bch_ioctl_usage *u = NULL;
- unsigned nr_devices = 4;
+ struct bch_ioctl_fs_usage *u = NULL;
+ size_t replica_entries_bytes = 4096;
while (1) {
- u = xrealloc(u, sizeof(*u) + sizeof(u->devs[0]) * nr_devices);
- u->nr_devices = nr_devices;
+ u = xrealloc(u, sizeof(*u) + replica_entries_bytes);
+ u->replica_entries_bytes = replica_entries_bytes;
- if (!ioctl(fs.ioctl_fd, BCH_IOCTL_USAGE, u))
+ if (!ioctl(fs.ioctl_fd, BCH_IOCTL_FS_USAGE, u))
return u;
- if (errno != ENOSPC)
+ if (errno != ERANGE)
die("BCH_IOCTL_USAGE error: %m");
- nr_devices *= 2;
+
+ replica_entries_bytes *= 2;
}
}
+static inline struct bch_ioctl_dev_usage_v2 *bchu_dev_usage(struct bchfs_handle fs,
+ unsigned idx)
+{
+ struct bch_ioctl_dev_usage_v2 *u = xcalloc(sizeof(*u) + sizeof(u->d[0]) * BCH_DATA_NR, 1);
+
+ u->dev = idx;
+ u->flags = BCH_BY_INDEX;
+ u->nr_data_types = BCH_DATA_NR;
+
+ if (!ioctl(fs.ioctl_fd, BCH_IOCTL_DEV_USAGE_V2, u))
+ return u;
+
+ struct bch_ioctl_dev_usage u_v1 = { .dev = idx, .flags = BCH_BY_INDEX};
+ xioctl(fs.ioctl_fd, BCH_IOCTL_DEV_USAGE, &u_v1);
+
+ u->state = u_v1.state;
+ u->nr_data_types = ARRAY_SIZE(u_v1.d);
+ u->bucket_size = u_v1.bucket_size;
+ u->nr_buckets = u_v1.nr_buckets;
+
+ for (unsigned i = 0; i < ARRAY_SIZE(u_v1.d); i++)
+ u->d[i] = u_v1.d[i];
+
+ return u;
+}
+
static inline struct bch_sb *bchu_read_super(struct bchfs_handle fs, unsigned idx)
{
size_t size = 4096;
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 {
+ unsigned idx;
+ char *dev;
+ char *label;
+ uuid_t uuid;
+ unsigned durability;
+};
+typedef DARRAY(struct dev_name) dev_names;
+
+dev_names bchu_fs_get_devices(struct bchfs_handle);
+
#endif /* _LIBBCACHE_H */
projects / bcachefs-tools-debian / blobdiff