Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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 <dsterba@suse.com>
+17
-26
+17
-26
fs/btrfs/subpage.c
+17
-26
fs/btrfs/subpage.c
···
194
194
#define subpage_calc_start_bit(fs_info, folio, name, start, len) \
195
195
({ \
196
196
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); \
199
198
\
200
199
btrfs_subpage_assert(fs_info, folio, start, len); \
201
200
__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; \
203
202
__start_bit; \
204
203
})
205
204
···
337
338
338
339
#define subpage_test_bitmap_all_set(fs_info, folio, name) \
339
340
({ \
340
-
struct btrfs_folio_state *bfs = folio_get_private(folio); \
341
-
const unsigned int blocks_per_folio = \
342
-
btrfs_blocks_per_folio(fs_info, folio); \
341
+
struct btrfs_folio_state *__bfs = folio_get_private(folio); \
342
+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
343
343
\
344
-
bitmap_test_range_all_set(bfs->bitmaps, \
345
-
blocks_per_folio * btrfs_bitmap_nr_##name, \
346
-
blocks_per_folio); \
344
+
bitmap_test_range_all_set(__bfs->bitmaps, \
345
+
__bpf * btrfs_bitmap_nr_##name, __bpf); \
347
346
})
348
347
349
348
#define subpage_test_bitmap_all_zero(fs_info, folio, name) \
350
349
({ \
351
-
struct btrfs_folio_state *bfs = folio_get_private(folio); \
352
-
const unsigned int blocks_per_folio = \
353
-
btrfs_blocks_per_folio(fs_info, folio); \
350
+
struct btrfs_folio_state *__bfs = folio_get_private(folio); \
351
+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
354
352
\
355
-
bitmap_test_range_all_zero(bfs->bitmaps, \
356
-
blocks_per_folio * btrfs_bitmap_nr_##name, \
357
-
blocks_per_folio); \
353
+
bitmap_test_range_all_zero(__bfs->bitmaps, \
354
+
__bpf * btrfs_bitmap_nr_##name, __bpf); \
358
355
})
359
356
360
357
void btrfs_subpage_set_uptodate(const struct btrfs_fs_info *fs_info,
···
667
672
668
673
#define GET_SUBPAGE_BITMAP(fs_info, folio, name, dst) \
669
674
{ \
670
-
const unsigned int blocks_per_folio = \
671
-
btrfs_blocks_per_folio(fs_info, folio); \
672
-
const struct btrfs_folio_state *bfs = folio_get_private(folio); \
675
+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
676
+
const struct btrfs_folio_state *__bfs = folio_get_private(folio); \
673
677
\
674
-
ASSERT(blocks_per_folio <= BITS_PER_LONG); \
675
-
*dst = bitmap_read(bfs->bitmaps, \
676
-
blocks_per_folio * btrfs_bitmap_nr_##name, \
677
-
blocks_per_folio); \
678
+
ASSERT(__bpf <= BITS_PER_LONG); \
679
+
*dst = bitmap_read(__bfs->bitmaps, \
680
+
__bpf * btrfs_bitmap_nr_##name, __bpf); \
678
681
}
679
682
680
683
#define SUBPAGE_DUMP_BITMAP(fs_info, folio, name, start, len) \
681
684
{ \
682
685
unsigned long bitmap; \
683
-
const unsigned int blocks_per_folio = \
684
-
btrfs_blocks_per_folio(fs_info, folio); \
686
+
const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \
685
687
\
686
688
GET_SUBPAGE_BITMAP(fs_info, folio, name, &bitmap); \
687
689
btrfs_warn(fs_info, \
688
690
"dumping bitmap start=%llu len=%u folio=%llu " #name "_bitmap=%*pbl", \
689
-
start, len, folio_pos(folio), \
690
-
blocks_per_folio, &bitmap); \
691
+
start, len, folio_pos(folio), __bpf, &bitmap); \
691
692
}
692
693
693
694
/*