diff options
| author | David Sterba <dsterba@suse.com> | 2024-05-20 19:49:17 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2024-07-11 15:33:18 +0200 |
| commit | 91629e6dea437c6e7f01431e423a90ed1bab5db3 (patch) | |
| tree | 4b6eaaca7b2c46a2d6dd4a2cef611ae3c6cc1c83 /fs/btrfs/subpage.c | |
| parent | 9c5e1fb024df2675eeb6a2f43770687602a0ffdc (diff) | |
btrfs: rename macro local variables that clash with other variables
Fix variable names in two macros where there's a local function variable
of the same name. In subpage_calc_start_bit() it's in several callers,
in btrfs_abort_transaction() it's only in replace_file_extents().
Found by 'make W=2'.
Reviewed-by: Boris Burkov <boris@bur.io>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/subpage.c')
| -rw-r--r-- | fs/btrfs/subpage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c index 54736f6238e6..86468305cd73 100644 --- a/fs/btrfs/subpage.c +++ b/fs/btrfs/subpage.c @@ -242,12 +242,12 @@ static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info, #define subpage_calc_start_bit(fs_info, folio, name, start, len) \ ({ \ - unsigned int start_bit; \ + unsigned int __start_bit; \ \ btrfs_subpage_assert(fs_info, folio, start, len); \ - start_bit = offset_in_page(start) >> fs_info->sectorsize_bits; \ - start_bit += fs_info->subpage_info->name##_offset; \ - start_bit; \ + __start_bit = offset_in_page(start) >> fs_info->sectorsize_bits; \ + __start_bit += fs_info->subpage_info->name##_offset; \ + __start_bit; \ }) void btrfs_subpage_start_reader(const struct btrfs_fs_info *fs_info, |