bcachefs: bch2_bkey_drop_ptrs() declares loop iter

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

diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c
index c111976fd7182332ef0998ae94b485dfb056c3da..9dcaccda7b935732bcdafbc2af8c5e615a874e23 100644 (file)
--- a/fs/bcachefs/btree_io.c
+++ b/fs/bcachefs/btree_io.c
@@ -1865,7 +1865,6 @@ static void btree_node_write_work(struct work_struct *work)
                container_of(work, struct btree_write_bio, work);
        struct bch_fs *c        = wbio->wbio.c;
        struct btree *b         = wbio->wbio.bio.bi_private;
-       struct bch_extent_ptr *ptr;
        int ret = 0;
 
        btree_bounce_free(c,

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 2e8b092a18206497f0cdbe6a2de438c33339633f..80eb862a89620f29a681572f109e92f8bc9c06e4 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -2491,7 +2491,6 @@ int bch2_btree_node_update_key_get_iter(struct btree_trans *trans,
 
        BUG_ON(!btree_node_hashed(b));
 
-       struct bch_extent_ptr *ptr;
        bch2_bkey_drop_ptrs(bkey_i_to_s(new_key), ptr,
                            !bch2_bkey_has_device(bkey_i_to_s(&b->key), ptr->dev));
 

diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c
index e8c7c5cec03fedc5bd2e55f1b208dd77eab2e6ee..88f49e7d2a16d0637272cb5e856cc4ea4e572a1c 100644 (file)
--- a/fs/bcachefs/data_update.c
+++ b/fs/bcachefs/data_update.c
@@ -467,7 +467,6 @@ int bch2_extent_drop_ptrs(struct btree_trans *trans,
 
        while (data_opts.kill_ptrs) {
                unsigned i = 0, drop = __fls(data_opts.kill_ptrs);
-               struct bch_extent_ptr *ptr;
 
                bch2_bkey_drop_ptrs(bkey_i_to_s(n), ptr, i++ == drop);
                data_opts.kill_ptrs ^= 1U << drop;

diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c
index 64dcf852daedd171b083e5946eb8055d69518abc..330c3da70b96fd1f322df7ba1d083870e15f49e0 100644 (file)
--- a/fs/bcachefs/ec.c
+++ b/fs/bcachefs/ec.c
@@ -1200,7 +1200,7 @@ static int ec_stripe_update_extent(struct btree_trans *trans,
        struct btree_iter iter;
        struct bkey_s_c k;
        const struct bch_extent_ptr *ptr_c;
-       struct bch_extent_ptr *ptr, *ec_ptr = NULL;
+       struct bch_extent_ptr *ec_ptr = NULL;
        struct bch_extent_stripe_ptr stripe_ptr;
        struct bkey_i *n;
        int ret, dev, block;

diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c
index 1143288d7940807d15c716917e008471dead6e3b..0d1473ba584a4360f30e0a969cd70dc55580994f 100644 (file)
--- a/fs/bcachefs/extents.c
+++ b/fs/bcachefs/extents.c
@@ -838,8 +838,6 @@ union bch_extent_entry *bch2_bkey_drop_ptr(struct bkey_s k,
 
 void bch2_bkey_drop_device(struct bkey_s k, unsigned dev)
 {
-       struct bch_extent_ptr *ptr;
-
        bch2_bkey_drop_ptrs(k, ptr, ptr->dev == dev);
 }
 
@@ -974,8 +972,6 @@ void bch2_extent_ptr_set_cached(struct bkey_s k, struct bch_extent_ptr *ptr)
  */
 bool bch2_extent_normalize(struct bch_fs *c, struct bkey_s k)
 {
-       struct bch_extent_ptr *ptr;
-
        bch2_bkey_drop_ptrs(k, ptr,
                ptr->cached &&
                ptr_stale(bch2_dev_bkey_exists(c, ptr->dev), ptr));

diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h
index 528e817eacbdad3a058eaf20c8a7526fd9dea3d9..10e1817e83e3bcea6cb9a4bc4513fa855215d458 100644 (file)
--- a/fs/bcachefs/extents.h
+++ b/fs/bcachefs/extents.h
@@ -654,7 +654,7 @@ union bch_extent_entry *bch2_bkey_drop_ptr(struct bkey_s,
 do {                                                                   \
        struct bkey_ptrs _ptrs = bch2_bkey_ptrs(_k);                    \
                                                                        \
-       _ptr = &_ptrs.start->ptr;                                       \
+       struct bch_extent_ptr *_ptr = &_ptrs.start->ptr;                \
                                                                        \
        while ((_ptr = bkey_ptr_next(_ptrs, _ptr))) {                   \
                if (_cond) {                                            \

diff --git a/fs/bcachefs/io_write.c b/fs/bcachefs/io_write.c
index 73e25250de7540407dd27f29f3a6db2cddbd2db8..e96dad0dd60d4a8f2f72d7272fc17ff78c51ac5f 100644 (file)
--- a/fs/bcachefs/io_write.c
+++ b/fs/bcachefs/io_write.c
@@ -481,7 +481,6 @@ static void bch2_write_done(struct closure *cl)
 static noinline int bch2_write_drop_io_error_ptrs(struct bch_write_op *op)
 {
        struct keylist *keys = &op->insert_keys;
-       struct bch_extent_ptr *ptr;
        struct bkey_i *src, *dst = keys->keys, *n;
 
        for (src = keys->keys; src != keys->top; src = n) {