Update bcachefs sources to d7f6da1d60 bcachefs: fix missing include

[bcachefs-tools-debian] / libbcachefs.h

diff --git a/libbcachefs.h b/libbcachefs.h
index dc5098339eb22bdb1eeddd0c70faa15e0d4d4390..7f914d226a04e6222a5d05b30466e2206f6cb2eb 100644 (file)
--- a/libbcachefs.h
+++ b/libbcachefs.h
@@ -25,9 +25,14 @@ struct format_opts {
        unsigned        meta_replicas_required;
        unsigned        data_replicas_required;
 
+       const char      *foreground_target;
+       const char      *background_target;
+       const char      *promote_target;
+
        unsigned        meta_csum_type;
        unsigned        data_csum_type;
        unsigned        compression_type;
+       unsigned        background_compression_type;
 
        bool            encrypted;
        char            *passphrase;
@@ -52,8 +57,9 @@ struct dev_opts {
        char            *path;
        u64             size; /* 512 byte sectors */
        unsigned        bucket_size;
-       unsigned        tier;
+       const char      *group;
        unsigned        data_allowed;
+       unsigned        durability;
        bool            discard;
 
        u64             nbuckets;
@@ -66,6 +72,7 @@ static inline struct dev_opts dev_opts_default()
 {
        return (struct dev_opts) {
                .data_allowed           = ~0U << 2,
+               .durability             = 1,
        };
 }
 
@@ -89,27 +96,53 @@ 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 *);
 
 static inline void bchu_disk_add(struct bchfs_handle fs, char *dev)
 {
-       struct bch_ioctl_disk i = { .dev = (__u64) dev, };
+       struct bch_ioctl_disk i = { .dev = (unsigned long) dev, };
 
        xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_ADD, &i);
 }
 
-static inline void bchu_disk_set_state(struct bchfs_handle fs, const char *dev,
+static inline void bchu_disk_remove(struct bchfs_handle fs, unsigned dev_idx,
+                                   unsigned flags)
+{
+       struct bch_ioctl_disk i = {
+               .flags  = flags|BCH_BY_INDEX,
+               .dev    = dev_idx,
+       };
+
+       xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_REMOVE, &i);
+}
+
+static inline void bchu_disk_online(struct bchfs_handle fs, char *dev)
+{
+       struct bch_ioctl_disk i = { .dev = (unsigned long) dev, };
+
+       xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_ONLINE, &i);
+}
+
+static inline void bchu_disk_offline(struct bchfs_handle fs, unsigned dev_idx,
+                                    unsigned flags)
+{
+       struct bch_ioctl_disk i = {
+               .flags  = flags|BCH_BY_INDEX,
+               .dev    = dev_idx,
+       };
+
+       xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_OFFLINE, &i);
+}
+
+static inline void bchu_disk_set_state(struct bchfs_handle fs, unsigned dev,
                                       unsigned new_state, unsigned flags)
 {
        struct bch_ioctl_disk_set_state i = {
-               .flags          = flags,
+               .flags          = flags|BCH_BY_INDEX,
                .new_state      = new_state,
+               .dev            = dev,
        };
 
-       if (!kstrtoull(dev, 10, &i.dev))
-               i.flags |= BCH_BY_INDEX;
-       else
-               i.dev = (u64) dev;
-
        xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_SET_STATE, &i);
 }
 
@@ -140,7 +173,7 @@ static inline struct bch_sb *bchu_read_super(struct bchfs_handle fs, unsigned id
                sb = xrealloc(sb, size);
                struct bch_ioctl_read_super i = {
                        .size   = size,
-                       .sb     = (u64) sb,
+                       .sb     = (unsigned long) sb,
                };
 
                if (idx != -1) {
@@ -176,4 +209,6 @@ static inline void bchu_disk_resize(struct bchfs_handle fs,
        xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_RESIZE, &i);
 }
 
+int bchu_data(struct bchfs_handle, struct bch_ioctl_data);
+
 #endif /* _LIBBCACHE_H */