btrfs: fix trivial -Wshadow warnings

When compiling with -Wshadow (also in 'make W=2' build) there are
several reports of shadowed variables that seem to be harmless:

- btrfs_do_encoded_write() - we can reuse 'ordered', there's no previous
			     value that would need to be preserved

- scrub_write_endio() - we need a standalone 'i' for bio iteration

- scrub_stripe() - duplicate ret2 for errors that must not overwrite 'ret'

- btrfs_subpage_set_writeback() - 'flags' is used for another irqsave lock
                                  but is not overwritten when reused for xarray
				  due to scoping, but for clarity let's rename it

- process_dir_items_leaf() - duplicate 'ret', used only for immediate checks

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6282911e536f08d3833448b01bcd08aa751445a3..6131589aba7cb441ea2305b22e2affcf13f2b8d1 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9826,8 +9826,6 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,
        }
 
        for (;;) {
-               struct btrfs_ordered_extent *ordered;
-
                ret = btrfs_wait_ordered_range(inode, start, num_bytes);
                if (ret)
                        goto out_folios;

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index ba20d9286a340cb671fe94e5b2b43a33c50f0521..e760e76df3f0f527f7e9d099d5ae8c2905d00f7f 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1284,7 +1284,7 @@ static void scrub_write_endio(struct btrfs_bio *bbio)
                bitmap_set(&stripe->write_error_bitmap, sector_nr,
                           bio_size >> fs_info->sectorsize_bits);
                spin_unlock_irqrestore(&stripe->write_error_lock, flags);
-               for (int i = 0; i < (bio_size >> fs_info->sectorsize_bits); i++)
+               for (i = 0; i < (bio_size >> fs_info->sectorsize_bits); i++)
                        btrfs_dev_stat_inc_and_print(stripe->dev,
                                                     BTRFS_DEV_STAT_WRITE_ERRS);
        }
@@ -2529,8 +2529,6 @@ out:
        }
 
        if (sctx->is_dev_replace && ret >= 0) {
-               int ret2;
-
                ret2 = sync_write_pointer_for_zoned(sctx,
                                chunk_logical + offset,
                                map->stripes[stripe_index].physical,

diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
index 5ca8d4db67220c1645d40859b3cc1c07dd11963b..01bf58fa92aa2e8efaf284fd53d3a6b624afb62f 100644 (file)
--- a/fs/btrfs/subpage.c
+++ b/fs/btrfs/subpage.c
@@ -460,12 +460,12 @@ void btrfs_subpage_set_writeback(const struct btrfs_fs_info *fs_info,
        if (!folio_test_dirty(folio)) {
                struct address_space *mapping = folio_mapping(folio);
                XA_STATE(xas, &mapping->i_pages, folio->index);
-               unsigned long flags;
+               unsigned long xa_flags;
 
-               xas_lock_irqsave(&xas, flags);
+               xas_lock_irqsave(&xas, xa_flags);
                xas_load(&xas);
                xas_clear_mark(&xas, PAGECACHE_TAG_TOWRITE);
-               xas_unlock_irqrestore(&xas, flags);
+               xas_unlock_irqrestore(&xas, xa_flags);
        }
        spin_unlock_irqrestore(&bfs->lock, flags);
 }

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 30f3c3b849c1437cca3b548d502844e013e31634..f7e5fe3adff2263aae7465502807e425abad7567 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4154,7 +4154,6 @@ static int process_dir_items_leaf(struct btrfs_trans_handle *trans,
        for (int i = path->slots[0]; i < nritems; i++) {
                struct btrfs_dir_item *di;
                struct btrfs_key key;
-               int ret;
 
                btrfs_item_key_to_cpu(src, &key, i);
 
@@ -4224,8 +4223,6 @@ static int process_dir_items_leaf(struct btrfs_trans_handle *trans,
        }
 
        if (batch_size > 0) {
-               int ret;
-
                ret = flush_dir_items_batch(trans, inode, src, dst_path,
                                            batch_start, batch_size);
                if (ret < 0)