Update bcachefs sources to f7670cba39 bcachefs: Fix for building in userspace

[bcachefs-tools-debian] / libbcachefs / disk_groups.h

diff --git a/libbcachefs/disk_groups.h b/libbcachefs/disk_groups.h
index 9da9805af91c2931aadc7b4e5f08805a23bf38d8..b90b0ef5c85f8beecbed11710b0bff57d31d3bcb 100644 (file)
--- a/libbcachefs/disk_groups.h
+++ b/libbcachefs/disk_groups.h
@@ -53,41 +53,29 @@ static inline struct target target_decode(unsigned target)
        return (struct target) { .type = TARGET_NULL };
 }
 
-static inline bool dev_in_target(struct bch_dev *ca, unsigned target)
-{
-       struct target t = target_decode(target);
-
-       switch (t.type) {
-       case TARGET_NULL:
-               return false;
-       case TARGET_DEV:
-               return ca->dev_idx == t.dev;
-       case TARGET_GROUP:
-               return ca->mi.group && ca->mi.group - 1 == t.group;
-       default:
-               BUG();
-       }
-}
+const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *, unsigned);
 
-static inline bool dev_idx_in_target(struct bch_fs *c, unsigned dev, unsigned target)
+static inline struct bch_devs_mask target_rw_devs(struct bch_fs *c,
+                                                 enum bch_data_type data_type,
+                                                 u16 target)
 {
-       bool ret;
+       struct bch_devs_mask devs = c->rw_devs[data_type];
+       const struct bch_devs_mask *t = bch2_target_to_mask(c, target);
 
-       rcu_read_lock();
-       ret = dev_in_target(rcu_dereference(c->devs[dev]), target);
-       rcu_read_unlock();
-
-       return ret;
+       if (t)
+               bitmap_and(devs.d, devs.d, t->d, BCH_SB_MEMBERS_MAX);
+       return devs;
 }
 
-const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *, unsigned);
+bool bch2_dev_in_target(struct bch_fs *, unsigned, unsigned);
 
 int bch2_disk_path_find(struct bch_sb_handle *, const char *);
 int bch2_disk_path_find_or_create(struct bch_sb_handle *, const char *);
-int bch2_disk_path_print(struct bch_sb_handle *, char *, size_t, unsigned);
+void bch2_disk_path_to_text(struct printbuf *, struct bch_sb_handle *,
+                           unsigned);
 
 int bch2_opt_target_parse(struct bch_fs *, const char *, u64 *);
-int bch2_opt_target_print(struct bch_fs *, char *, size_t, u64);
+void bch2_opt_target_to_text(struct printbuf *, struct bch_fs *, u64);
 
 int bch2_sb_disk_groups_to_cpu(struct bch_fs *);