Update bcachefs sources to 1a739db0b256 bcachefs; guard against overflow in btree...

[bcachefs-tools-debian] / libbcachefs / sb-members.h

diff --git a/libbcachefs/sb-members.h b/libbcachefs/sb-members.h
index 03613e3eb8e3df5bcda99218fb0168cf1f8bf9f8..f32aefe21bdcf6455da232304a1294fe45439218 100644 (file)
--- a/libbcachefs/sb-members.h
+++ b/libbcachefs/sb-members.h
@@ -82,30 +82,38 @@ static inline struct bch_devs_list bch2_dev_list_single(unsigned dev)
        return (struct bch_devs_list) { .nr = 1, .devs[0] = dev };
 }
 
-static inline struct bch_dev *__bch2_next_dev(struct bch_fs *c, unsigned *iter,
-                                             const struct bch_devs_mask *mask)
+static inline struct bch_dev *__bch2_next_dev_idx(struct bch_fs *c, unsigned idx,
+                                                 const struct bch_devs_mask *mask)
 {
        struct bch_dev *ca = NULL;
 
-       while ((*iter = mask
-               ? find_next_bit(mask->d, c->sb.nr_devices, *iter)
-               : *iter) < c->sb.nr_devices &&
-              !(ca = rcu_dereference_check(c->devs[*iter],
+       while ((idx = mask
+               ? find_next_bit(mask->d, c->sb.nr_devices, idx)
+               : idx) < c->sb.nr_devices &&
+              !(ca = rcu_dereference_check(c->devs[idx],
                                            lockdep_is_held(&c->state_lock))))
-               (*iter)++;
+               idx++;
 
        return ca;
 }
 
-#define for_each_member_device_rcu(ca, c, iter, mask)                  \
-       for ((iter) = 0; ((ca) = __bch2_next_dev((c), &(iter), mask)); (iter)++)
+static inline struct bch_dev *__bch2_next_dev(struct bch_fs *c, struct bch_dev *ca,
+                                             const struct bch_devs_mask *mask)
+{
+       return __bch2_next_dev_idx(c, ca ? ca->dev_idx + 1 : 0, mask);
+}
 
-static inline struct bch_dev *bch2_get_next_dev(struct bch_fs *c, unsigned *iter)
+#define for_each_member_device_rcu(_c, _ca, _mask)                     \
+       for (struct bch_dev *_ca = NULL;                                \
+            (_ca = __bch2_next_dev((_c), _ca, (_mask)));)
+
+static inline struct bch_dev *bch2_get_next_dev(struct bch_fs *c, struct bch_dev *ca)
 {
-       struct bch_dev *ca;
+       if (ca)
+               percpu_ref_put(&ca->ref);
 
        rcu_read_lock();
-       if ((ca = __bch2_next_dev(c, iter, NULL)))
+       if ((ca = __bch2_next_dev(c, ca, NULL)))
                percpu_ref_get(&ca->ref);
        rcu_read_unlock();
 
@@ -115,41 +123,42 @@ static inline struct bch_dev *bch2_get_next_dev(struct bch_fs *c, unsigned *iter
 /*
  * If you break early, you must drop your ref on the current device
  */
-#define for_each_member_device(ca, c, iter)                            \
-       for ((iter) = 0;                                                \
-            (ca = bch2_get_next_dev(c, &(iter)));                      \
-            percpu_ref_put(&ca->ref), (iter)++)
+#define __for_each_member_device(_c, _ca)                              \
+       for (;  (_ca = bch2_get_next_dev(_c, _ca));)
+
+#define for_each_member_device(_c, _ca)                                        \
+       for (struct bch_dev *_ca = NULL;                                \
+            (_ca = bch2_get_next_dev(_c, _ca));)
 
 static inline struct bch_dev *bch2_get_next_online_dev(struct bch_fs *c,
-                                                     unsigned *iter,
-                                                     int state_mask)
+                                                      struct bch_dev *ca,
+                                                      unsigned state_mask)
 {
-       struct bch_dev *ca;
+       if (ca)
+               percpu_ref_put(&ca->io_ref);
 
        rcu_read_lock();
-       while ((ca = __bch2_next_dev(c, iter, NULL)) &&
+       while ((ca = __bch2_next_dev(c, ca, NULL)) &&
               (!((1 << ca->mi.state) & state_mask) ||
                !percpu_ref_tryget(&ca->io_ref)))
-               (*iter)++;
+               ;
        rcu_read_unlock();
 
        return ca;
 }
 
-#define __for_each_online_member(ca, c, iter, state_mask)              \
-       for ((iter) = 0;                                                \
-            (ca = bch2_get_next_online_dev(c, &(iter), state_mask));   \
-            percpu_ref_put(&ca->io_ref), (iter)++)
+#define __for_each_online_member(_c, _ca, state_mask)                  \
+       for (struct bch_dev *_ca = NULL;                                \
+            (_ca = bch2_get_next_online_dev(_c, _ca, state_mask));)
 
-#define for_each_online_member(ca, c, iter)                            \
-       __for_each_online_member(ca, c, iter, ~0)
+#define for_each_online_member(c, ca)                                  \
+       __for_each_online_member(c, ca, ~0)
 
-#define for_each_rw_member(ca, c, iter)                                        \
-       __for_each_online_member(ca, c, iter, 1 << BCH_MEMBER_STATE_rw)
+#define for_each_rw_member(c, ca)                                      \
+       __for_each_online_member(c, ca, BIT(BCH_MEMBER_STATE_rw))
 
-#define for_each_readable_member(ca, c, iter)                          \
-       __for_each_online_member(ca, c, iter,                           \
-               (1 << BCH_MEMBER_STATE_rw)|(1 << BCH_MEMBER_STATE_ro))
+#define for_each_readable_member(c, ca)                                \
+       __for_each_online_member(c, ca, BIT( BCH_MEMBER_STATE_rw)|BIT(BCH_MEMBER_STATE_ro))
 
 /*
  * If a key exists that references a device, the device won't be going away and
@@ -175,11 +184,9 @@ static inline struct bch_dev *bch_dev_locked(struct bch_fs *c, unsigned idx)
 static inline struct bch_devs_mask bch2_online_devs(struct bch_fs *c)
 {
        struct bch_devs_mask devs;
-       struct bch_dev *ca;
-       unsigned i;
 
        memset(&devs, 0, sizeof(devs));
-       for_each_online_member(ca, c, i)
+       for_each_online_member(c, ca)
                __set_bit(ca->dev_idx, devs.d);
        return devs;
 }