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

[bcachefs-tools-debian] / libbcachefs / super-io.c

diff --git a/libbcachefs/super-io.c b/libbcachefs/super-io.c
index 136c01403c95465c23488504c0f2e92798bd10e2..326faf253255bea91a6b6628d1f9066ce3965b3d 100644 (file)
--- a/libbcachefs/super-io.c
+++ b/libbcachefs/super-io.c
@@ -100,8 +100,6 @@ static int bch2_sb_field_validate(struct bch_sb *, struct bch_sb_field *,
 struct bch_sb_field *bch2_sb_field_get_id(struct bch_sb *sb,
                                      enum bch_sb_field_type type)
 {
-       struct bch_sb_field *f;
-
        /* XXX: need locking around superblock to access optional fields */
 
        vstruct_for_each(sb, f)
@@ -240,14 +238,12 @@ struct bch_sb_field *bch2_sb_field_resize_id(struct bch_sb_handle *sb,
 
        if (sb->fs_sb) {
                struct bch_fs *c = container_of(sb, struct bch_fs, disk_sb);
-               struct bch_dev *ca;
-               unsigned i;
 
                lockdep_assert_held(&c->sb_lock);
 
                /* XXX: we're not checking that offline device have enough space */
 
-               for_each_online_member(ca, c, i) {
+               for_each_online_member(c, ca) {
                        struct bch_sb_handle *dev_sb = &ca->disk_sb;
 
                        if (bch2_sb_realloc(dev_sb, le32_to_cpu(dev_sb->sb->u64s) + d)) {
@@ -356,7 +352,6 @@ static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,
                            int rw)
 {
        struct bch_sb *sb = disk_sb->sb;
-       struct bch_sb_field *f;
        struct bch_sb_field_members_v1 *mi;
        enum bch_opt_id opt_id;
        u16 block_size;
@@ -487,8 +482,6 @@ static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,
 static void bch2_sb_update(struct bch_fs *c)
 {
        struct bch_sb *src = c->disk_sb.sb;
-       struct bch_dev *ca;
-       unsigned i;
 
        lockdep_assert_held(&c->sb_lock);
 
@@ -512,8 +505,8 @@ static void bch2_sb_update(struct bch_fs *c)
        c->sb.features          = le64_to_cpu(src->features[0]);
        c->sb.compat            = le64_to_cpu(src->compat[0]);
 
-       for_each_member_device(ca, c, i) {
-               struct bch_member m = bch2_sb_member_get(src, i);
+       for_each_member_device(c, ca) {
+               struct bch_member m = bch2_sb_member_get(src, ca->dev_idx);
                ca->mi = bch2_mi_to_cpu(&m);
        }
 }
@@ -892,9 +885,8 @@ static void write_one_super(struct bch_fs *c, struct bch_dev *ca, unsigned idx)
 int bch2_write_super(struct bch_fs *c)
 {
        struct closure *cl = &c->sb_write;
-       struct bch_dev *ca;
        struct printbuf err = PRINTBUF;
-       unsigned i, sb = 0, nr_wrote;
+       unsigned sb = 0, nr_wrote;
        struct bch_devs_mask sb_written;
        bool wrote, can_mount_without_written, can_mount_with_written;
        unsigned degraded_flags = BCH_FORCE_IF_DEGRADED;
@@ -928,10 +920,10 @@ int bch2_write_super(struct bch_fs *c)
        bch2_sb_members_cpy_v2_v1(&c->disk_sb);
        bch2_sb_errors_from_cpu(c);
 
-       for_each_online_member(ca, c, i)
+       for_each_online_member(c, ca)
                bch2_sb_from_fs(c, ca);
 
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                printbuf_reset(&err);
 
                ret = bch2_sb_validate(&ca->disk_sb, &err, WRITE);
@@ -952,16 +944,16 @@ int bch2_write_super(struct bch_fs *c)
        if (!BCH_SB_INITIALIZED(c->disk_sb.sb))
                goto out;
 
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                __set_bit(ca->dev_idx, sb_written.d);
                ca->sb_write_error = 0;
        }
 
-       for_each_online_member(ca, c, i)
+       for_each_online_member(c, ca)
                read_back_super(c, ca);
        closure_sync(cl);
 
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                if (ca->sb_write_error)
                        continue;
 
@@ -988,7 +980,7 @@ int bch2_write_super(struct bch_fs *c)
 
        do {
                wrote = false;
-               for_each_online_member(ca, c, i)
+               for_each_online_member(c, ca)
                        if (!ca->sb_write_error &&
                            sb < ca->disk_sb.sb->layout.nr_superblocks) {
                                write_one_super(c, ca, sb);
@@ -998,7 +990,7 @@ int bch2_write_super(struct bch_fs *c)
                sb++;
        } while (wrote);
 
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                if (ca->sb_write_error)
                        __clear_bit(ca->dev_idx, sb_written.d);
                else
@@ -1010,7 +1002,7 @@ int bch2_write_super(struct bch_fs *c)
        can_mount_with_written =
                bch2_have_enough_devs(c, sb_written, degraded_flags, false);
 
-       for (i = 0; i < ARRAY_SIZE(sb_written.d); i++)
+       for (unsigned i = 0; i < ARRAY_SIZE(sb_written.d); i++)
                sb_written.d[i] = ~sb_written.d[i];
 
        can_mount_without_written =
@@ -1161,7 +1153,6 @@ void bch2_sb_layout_to_text(struct printbuf *out, struct bch_sb_layout *l)
 void bch2_sb_to_text(struct printbuf *out, struct bch_sb *sb,
                     bool print_layout, unsigned fields)
 {
-       struct bch_sb_field *f;
        u64 fields_have = 0;
        unsigned nr_devices = 0;