bcachefs: vstruct_for_each() now declares loop iter

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h
index 1e14e6b324f8faaed8537ddec4cef18a8627eeaa..4544ce24bb8a654e62be91c5d7e0242e51893c1c 100644 (file)
--- a/fs/bcachefs/journal.h
+++ b/fs/bcachefs/journal.h
@@ -238,8 +238,6 @@ bch2_journal_add_entry(struct journal *j, struct journal_res *res,
 
 static inline bool journal_entry_empty(struct jset *j)
 {
-       struct jset_entry *i;
-
        if (j->seq != j->last_seq)
                return false;
 

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index 364aca3b78fea513a103e2816fee5faad494b0a2..671a6820bc0cd3dfc7a9f9246da1018cf298ad6b 100644 (file)
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -783,7 +783,6 @@ void bch2_journal_entry_to_text(struct printbuf *out, struct bch_fs *c,
 static int jset_validate_entries(struct bch_fs *c, struct jset *jset,
                                 enum bkey_invalid_flags flags)
 {
-       struct jset_entry *entry;
        unsigned version = le32_to_cpu(jset->version);
        int ret = 0;
 
@@ -1723,7 +1722,7 @@ static CLOSURE_CALLBACK(do_journal_write)
 static int bch2_journal_write_prep(struct journal *j, struct journal_buf *w)
 {
        struct bch_fs *c = container_of(j, struct bch_fs, journal);
-       struct jset_entry *start, *end, *i;
+       struct jset_entry *start, *end;
        struct jset *jset = w->data;
        struct journal_keys_to_wb wb = { NULL };
        unsigned sectors, bytes, u64s;

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 0314a4c00aeeead910849861ab3994204674db66..a792f42ab5ff0ea6d8627a1dcbc3a4af4fbbbaff 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -344,14 +344,11 @@ static int journal_replay_entry_early(struct bch_fs *c,
 static int journal_replay_early(struct bch_fs *c,
                                struct bch_sb_field_clean *clean)
 {
-       struct jset_entry *entry;
-       int ret;
-
        if (clean) {
-               for (entry = clean->start;
+               for (struct jset_entry *entry = clean->start;
                     entry != vstruct_end(&clean->field);
                     entry = vstruct_next(entry)) {
-                       ret = journal_replay_entry_early(c, entry);
+                       int ret = journal_replay_entry_early(c, entry);
                        if (ret)
                                return ret;
                }
@@ -366,7 +363,7 @@ static int journal_replay_early(struct bch_fs *c,
                                continue;
 
                        vstruct_for_each(&i->j, entry) {
-                               ret = journal_replay_entry_early(c, entry);
+                               int ret = journal_replay_entry_early(c, entry);
                                if (ret)
                                        return ret;
                        }

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index 270a96b5a6fd89e67c861e86debaad06629b96f8..89d2d2a86eb0b4bef05ecd3dc646843af5f76a1b 100644 (file)
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -101,8 +101,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)
@@ -366,7 +364,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;
@@ -1250,7 +1247,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;
 

diff --git a/fs/bcachefs/vstructs.h b/fs/bcachefs/vstructs.h
index a6561b4b36a6e15cf020a82ba2c6741659dbf757..2ad338e282da8263f2025f5a9241d37767f0b1d0 100644 (file)
--- a/fs/bcachefs/vstructs.h
+++ b/fs/bcachefs/vstructs.h
@@ -48,14 +48,14 @@
        ((void *)                       ((u64 *) (_s)->_data + __vstruct_u64s(_s)))
 
 #define vstruct_for_each(_s, _i)                                       \
-       for (_i = (_s)->start;                                          \
+       for (typeof(&(_s)->start[0]) _i = (_s)->start;                  \
             _i < vstruct_last(_s);                                     \
             _i = vstruct_next(_i))
 
-#define vstruct_for_each_safe(_s, _i, _t)                              \
-       for (_i = (_s)->start;                                          \
-            _i < vstruct_last(_s) && (_t = vstruct_next(_i), true);    \
-            _i = _t)
+#define vstruct_for_each_safe(_s, _i)                                  \
+       for (typeof(&(_s)->start[0]) _next, _i = (_s)->start;           \
+            _i < vstruct_last(_s) && (_next = vstruct_next(_i), true); \
+            _i = _next)
 
 #define vstruct_idx(_s, _idx)                                          \
        ((typeof(&(_s)->start[0])) ((_s)->_data + (_idx)))