@@ -194,12 +194,11 @@ static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info,
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
@@ -338,24 +337,20 @@ void btrfs_folio_end_lock_bitmap(const struct btrfs_fs_info *fs_info,
338
337
339
338
#define subpage_test_bitmap_all_set (fs_info , folio , name ) \
340
339
({ \
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); \
344
342
\
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); \
348
345
})
349
346
350
347
#define subpage_test_bitmap_all_zero (fs_info , folio , name ) \
351
348
({ \
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); \
355
351
\
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); \
359
354
})
360
355
361
356
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,
672
667
673
668
#define GET_SUBPAGE_BITMAP (fs_info , folio , name , dst ) \
674
669
{ \
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); \
678
672
\
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); \
683
676
}
684
677
685
678
#define SUBPAGE_DUMP_BITMAP (fs_info , folio , name , start , len ) \
686
679
{ \
687
680
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); \
690
682
\
691
683
GET_SUBPAGE_BITMAP(fs_info, folio, name, &bitmap); \
692
684
btrfs_warn(fs_info, \
693
685
"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); \
696
687
}
697
688
698
689
/*
0 commit comments