linux shim: Fix dropped O_DIRECT flag

[bcachefs-tools-debian] / libbcachefs.h

diff --git a/libbcachefs.h b/libbcachefs.h
index 61d0ea8d05a89e78dd3d035b24647d661e9907e2..4bb51bd89e45bddfd15fe51c9f40645e687c1883 100644 (file)
--- 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)
 {
@@ -140,24 +146,35 @@ static inline void bchu_disk_set_state(struct bchfs_handle fs, unsigned 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 != ERANGE)
                        die("BCH_IOCTL_USAGE error: %m");
-               nr_devices *= 2;
+
+               replica_entries_bytes *= 2;
        }
 }
 
+static inline struct bch_ioctl_dev_usage bchu_dev_usage(struct bchfs_handle fs,
+                                                       unsigned idx)
+{
+       struct bch_ioctl_dev_usage i = { .dev = idx, .flags = BCH_BY_INDEX};
+
+       if (xioctl(fs.ioctl_fd, BCH_IOCTL_DEV_USAGE, &i))
+               die("BCH_IOCTL_DEV_USAGE error: %m");
+       return i;
+}
+
 static inline struct bch_sb *bchu_read_super(struct bchfs_handle fs, unsigned idx)
 {
        size_t size = 4096;
@@ -203,6 +220,29 @@ 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 {
+       unsigned        idx;
+       char            *dev;
+       char            *label;
+       uuid_le         uuid;
+};
+typedef DARRAY(struct dev_name) dev_names;
+
+dev_names bchu_fs_get_devices(struct bchfs_handle);
+
 #endif /* _LIBBCACHE_H */