Delete more shim layer code

[bcachefs-tools-debian] / libbcachefs.h

diff --git a/libbcachefs.h b/libbcachefs.h
index c7c31dd2a58a470736bc41dc92f2460c8fb13756..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,
        };
 }
 
@@ -93,7 +100,7 @@ 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);
 }
@@ -111,7 +118,7 @@ static inline void bchu_disk_remove(struct bchfs_handle fs, unsigned dev_idx,
 
 static inline void bchu_disk_online(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_ONLINE, &i);
 }
@@ -166,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) {