Skip to content

Commit 38e17c3

Browse files
committed
btrfs: subpage: rename macro variables to avoid shadowing
When compiling with -Wshadow there are warnings in the subpage helper macros that are used in functions like btrfs_subpage_dump_bitmap() or btrfs_subpage_clear_and_test_dirty() that also use 'bfs' (for struct btrfs_folio_state) or blocks_per_folio. Add '__' to the macro variables and unify naming in all subpage macros. Signed-off-by: David Sterba <[email protected]>
1 parent 1738108 commit 38e17c3

File tree

1 file changed

+17
-26
lines changed

1 file changed

+17
-26
lines changed

fs/btrfs/subpage.c

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,11 @@ static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info,
194194
#define subpage_calc_start_bit(fs_info, folio, name, start, len) \
195195
({ \
196196
unsigned int __start_bit; \
197-
const unsigned int blocks_per_folio = \
198-
btrfs_blocks_per_folio(fs_info, folio); \
197+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
199198
\
200199
btrfs_subpage_assert(fs_info, folio, start, len); \
201200
__start_bit = offset_in_folio(folio, start) >> fs_info->sectorsize_bits; \
202-
__start_bit += blocks_per_folio * btrfs_bitmap_nr_##name; \
201+
__start_bit += __bpf * btrfs_bitmap_nr_##name; \
203202
__start_bit; \
204203
})
205204

@@ -338,24 +337,20 @@ void btrfs_folio_end_lock_bitmap(const struct btrfs_fs_info *fs_info,
338337

339338
#define subpage_test_bitmap_all_set(fs_info, folio, name) \
340339
({ \
341-
struct btrfs_folio_state *bfs = folio_get_private(folio); \
342-
const unsigned int blocks_per_folio = \
343-
btrfs_blocks_per_folio(fs_info, folio); \
340+
struct btrfs_folio_state *__bfs = folio_get_private(folio); \
341+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
344342
\
345-
bitmap_test_range_all_set(bfs->bitmaps, \
346-
blocks_per_folio * btrfs_bitmap_nr_##name, \
347-
blocks_per_folio); \
343+
bitmap_test_range_all_set(__bfs->bitmaps, \
344+
__bpf * btrfs_bitmap_nr_##name, __bpf); \
348345
})
349346

350347
#define subpage_test_bitmap_all_zero(fs_info, folio, name) \
351348
({ \
352-
struct btrfs_folio_state *bfs = folio_get_private(folio); \
353-
const unsigned int blocks_per_folio = \
354-
btrfs_blocks_per_folio(fs_info, folio); \
349+
struct btrfs_folio_state *__bfs = folio_get_private(folio); \
350+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
355351
\
356-
bitmap_test_range_all_zero(bfs->bitmaps, \
357-
blocks_per_folio * btrfs_bitmap_nr_##name, \
358-
blocks_per_folio); \
352+
bitmap_test_range_all_zero(__bfs->bitmaps, \
353+
__bpf * btrfs_bitmap_nr_##name, __bpf); \
359354
})
360355

361356
void btrfs_subpage_set_uptodate(const struct btrfs_fs_info *fs_info,
@@ -672,27 +667,23 @@ IMPLEMENT_BTRFS_PAGE_OPS(checked, folio_set_checked, folio_clear_checked,
672667

673668
#define GET_SUBPAGE_BITMAP(fs_info, folio, name, dst) \
674669
{ \
675-
const unsigned int blocks_per_folio = \
676-
btrfs_blocks_per_folio(fs_info, folio); \
677-
const struct btrfs_folio_state *bfs = folio_get_private(folio); \
670+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
671+
const struct btrfs_folio_state *__bfs = folio_get_private(folio); \
678672
\
679-
ASSERT(blocks_per_folio <= BITS_PER_LONG); \
680-
*dst = bitmap_read(bfs->bitmaps, \
681-
blocks_per_folio * btrfs_bitmap_nr_##name, \
682-
blocks_per_folio); \
673+
ASSERT(__bpf <= BITS_PER_LONG); \
674+
*dst = bitmap_read(__bfs->bitmaps, \
675+
__bpf * btrfs_bitmap_nr_##name, __bpf); \
683676
}
684677

685678
#define SUBPAGE_DUMP_BITMAP(fs_info, folio, name, start, len) \
686679
{ \
687680
unsigned long bitmap; \
688-
const unsigned int blocks_per_folio = \
689-
btrfs_blocks_per_folio(fs_info, folio); \
681+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
690682
\
691683
GET_SUBPAGE_BITMAP(fs_info, folio, name, &bitmap); \
692684
btrfs_warn(fs_info, \
693685
"dumping bitmap start=%llu len=%u folio=%llu " #name "_bitmap=%*pbl", \
694-
start, len, folio_pos(folio), \
695-
blocks_per_folio, &bitmap); \
686+
start, len, folio_pos(folio), __bpf, &bitmap); \
696687
}
697688

698689
/*

0 commit comments

Comments
 (0)