]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
btrfs: fix trivial -Wshadow warnings
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Sep 2025 09:47:30 +0000 (11:47 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 24 Nov 2025 20:37:36 +0000 (21:37 +0100)
commitaebe2bb0b861795cd832473b7257c6cc1cd086d0
tree5c928ad27668fc1c8fd481b156752a4f4e6c7387
parent9594783e4b4901cbc28ff940eff7e2554a4f7801
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>
fs/btrfs/inode.c
fs/btrfs/scrub.c
fs/btrfs/subpage.c
fs/btrfs/tree-log.c