Skip to content

Commit 2b48966

Browse files
kdavekdave
committed
btrfs: constify extent_buffer in the API functions
There are many helpers around extent buffers, found in extent_io.h and ctree.h. Most of them can be converted to take constified eb as there are no changes to the extent buffer structure itself but rather the pages. Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent db3756c commit 2b48966

File tree

4 files changed

+63
-55
lines changed

4 files changed

+63
-55
lines changed

‎fs/btrfs/ctree.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token, \
13841384
u##bits val); \
13851385
u##bits btrfs_get_##bits(const struct extent_buffer *eb, \
13861386
const void *ptr, unsigned long off); \
1387-
void btrfs_set_##bits(struct extent_buffer *eb, void *ptr, \
1387+
void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr, \
13881388
unsigned long off, u##bits val);
13891389

13901390
DECLARE_BTRFS_SETGET_BITS(8)
@@ -1399,7 +1399,7 @@ static inline u##bits btrfs_##name(const struct extent_buffer *eb, \
13991399
BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member); \
14001400
return btrfs_get_##bits(eb, s, offsetof(type, member)); \
14011401
} \
1402-
static inline void btrfs_set_##name(struct extent_buffer *eb, type *s, \
1402+
static inline void btrfs_set_##name(const struct extent_buffer *eb, type *s, \
14031403
u##bits val) \
14041404
{ \
14051405
BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member); \
@@ -1425,7 +1425,7 @@ static inline u##bits btrfs_##name(const struct extent_buffer *eb) \
14251425
u##bits res = le##bits##_to_cpu(p->member); \
14261426
return res; \
14271427
} \
1428-
static inline void btrfs_set_##name(struct extent_buffer *eb, \
1428+
static inline void btrfs_set_##name(const struct extent_buffer *eb, \
14291429
u##bits val) \
14301430
{ \
14311431
type *p = page_address(eb->pages[0]); \
@@ -1443,15 +1443,15 @@ static inline void btrfs_set_##name(type *s, u##bits val) \
14431443
}
14441444

14451445

1446-
static inline u64 btrfs_device_total_bytes(struct extent_buffer *eb,
1446+
static inline u64 btrfs_device_total_bytes(const struct extent_buffer *eb,
14471447
struct btrfs_dev_item *s)
14481448
{
14491449
BUILD_BUG_ON(sizeof(u64) !=
14501450
sizeof(((struct btrfs_dev_item *)0))->total_bytes);
14511451
return btrfs_get_64(eb, s, offsetof(struct btrfs_dev_item,
14521452
total_bytes));
14531453
}
1454-
static inline void btrfs_set_device_total_bytes(struct extent_buffer *eb,
1454+
static inline void btrfs_set_device_total_bytes(const struct extent_buffer *eb,
14551455
struct btrfs_dev_item *s,
14561456
u64 val)
14571457
{
@@ -1555,13 +1555,13 @@ static inline char *btrfs_stripe_dev_uuid_nr(struct btrfs_chunk *c, int nr)
15551555
return btrfs_stripe_dev_uuid(btrfs_stripe_nr(c, nr));
15561556
}
15571557

1558-
static inline u64 btrfs_stripe_offset_nr(struct extent_buffer *eb,
1558+
static inline u64 btrfs_stripe_offset_nr(const struct extent_buffer *eb,
15591559
struct btrfs_chunk *c, int nr)
15601560
{
15611561
return btrfs_stripe_offset(eb, btrfs_stripe_nr(c, nr));
15621562
}
15631563

1564-
static inline u64 btrfs_stripe_devid_nr(struct extent_buffer *eb,
1564+
static inline u64 btrfs_stripe_devid_nr(const struct extent_buffer *eb,
15651565
struct btrfs_chunk *c, int nr)
15661566
{
15671567
return btrfs_stripe_devid(eb, btrfs_stripe_nr(c, nr));
@@ -1648,14 +1648,14 @@ BTRFS_SETGET_FUNCS(extent_flags, struct btrfs_extent_item, flags, 64);
16481648

16491649
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
16501650

1651-
static inline void btrfs_tree_block_key(struct extent_buffer *eb,
1651+
static inline void btrfs_tree_block_key(const struct extent_buffer *eb,
16521652
struct btrfs_tree_block_info *item,
16531653
struct btrfs_disk_key *key)
16541654
{
16551655
read_eb_member(eb, item, struct btrfs_tree_block_info, key, key);
16561656
}
16571657

1658-
static inline void btrfs_set_tree_block_key(struct extent_buffer *eb,
1658+
static inline void btrfs_set_tree_block_key(const struct extent_buffer *eb,
16591659
struct btrfs_tree_block_info *item,
16601660
struct btrfs_disk_key *key)
16611661
{
@@ -1701,15 +1701,15 @@ BTRFS_SETGET_STACK_FUNCS(stack_key_blockptr, struct btrfs_key_ptr,
17011701
BTRFS_SETGET_STACK_FUNCS(stack_key_generation, struct btrfs_key_ptr,
17021702
generation, 64);
17031703

1704-
static inline u64 btrfs_node_blockptr(struct extent_buffer *eb, int nr)
1704+
static inline u64 btrfs_node_blockptr(const struct extent_buffer *eb, int nr)
17051705
{
17061706
unsigned long ptr;
17071707
ptr = offsetof(struct btrfs_node, ptrs) +
17081708
sizeof(struct btrfs_key_ptr) * nr;
17091709
return btrfs_key_blockptr(eb, (struct btrfs_key_ptr *)ptr);
17101710
}
17111711

1712-
static inline void btrfs_set_node_blockptr(struct extent_buffer *eb,
1712+
static inline void btrfs_set_node_blockptr(const struct extent_buffer *eb,
17131713
int nr, u64 val)
17141714
{
17151715
unsigned long ptr;
@@ -1718,15 +1718,15 @@ static inline void btrfs_set_node_blockptr(struct extent_buffer *eb,
17181718
btrfs_set_key_blockptr(eb, (struct btrfs_key_ptr *)ptr, val);
17191719
}
17201720

1721-
static inline u64 btrfs_node_ptr_generation(struct extent_buffer *eb, int nr)
1721+
static inline u64 btrfs_node_ptr_generation(const struct extent_buffer *eb, int nr)
17221722
{
17231723
unsigned long ptr;
17241724
ptr = offsetof(struct btrfs_node, ptrs) +
17251725
sizeof(struct btrfs_key_ptr) * nr;
17261726
return btrfs_key_generation(eb, (struct btrfs_key_ptr *)ptr);
17271727
}
17281728

1729-
static inline void btrfs_set_node_ptr_generation(struct extent_buffer *eb,
1729+
static inline void btrfs_set_node_ptr_generation(const struct extent_buffer *eb,
17301730
int nr, u64 val)
17311731
{
17321732
unsigned long ptr;
@@ -1744,7 +1744,7 @@ static inline unsigned long btrfs_node_key_ptr_offset(int nr)
17441744
void btrfs_node_key(const struct extent_buffer *eb,
17451745
struct btrfs_disk_key *disk_key, int nr);
17461746

1747-
static inline void btrfs_set_node_key(struct extent_buffer *eb,
1747+
static inline void btrfs_set_node_key(const struct extent_buffer *eb,
17481748
struct btrfs_disk_key *disk_key, int nr)
17491749
{
17501750
unsigned long ptr;

‎fs/btrfs/extent_io.c

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
23332333
return 0;
23342334
}
23352335

2336-
int btrfs_repair_eb_io_failure(struct extent_buffer *eb, int mirror_num)
2336+
int btrfs_repair_eb_io_failure(const struct extent_buffer *eb, int mirror_num)
23372337
{
23382338
struct btrfs_fs_info *fs_info = eb->fs_info;
23392339
u64 start = eb->start;
@@ -4910,7 +4910,7 @@ static void __free_extent_buffer(struct extent_buffer *eb)
49104910
kmem_cache_free(extent_buffer_cache, eb);
49114911
}
49124912

4913-
int extent_buffer_under_io(struct extent_buffer *eb)
4913+
int extent_buffer_under_io(const struct extent_buffer *eb)
49144914
{
49154915
return (atomic_read(&eb->io_pages) ||
49164916
test_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags) ||
@@ -5018,7 +5018,7 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start,
50185018
return eb;
50195019
}
50205020

5021-
struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src)
5021+
struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src)
50225022
{
50235023
int i;
50245024
struct page *p;
@@ -5424,7 +5424,7 @@ void free_extent_buffer_stale(struct extent_buffer *eb)
54245424
release_extent_buffer(eb);
54255425
}
54265426

5427-
void clear_extent_buffer_dirty(struct extent_buffer *eb)
5427+
void clear_extent_buffer_dirty(const struct extent_buffer *eb)
54285428
{
54295429
int i;
54305430
int num_pages;
@@ -5720,7 +5720,7 @@ int memcmp_extent_buffer(const struct extent_buffer *eb, const void *ptrv,
57205720
return ret;
57215721
}
57225722

5723-
void write_extent_buffer_chunk_tree_uuid(struct extent_buffer *eb,
5723+
void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,
57245724
const void *srcv)
57255725
{
57265726
char *kaddr;
@@ -5731,7 +5731,7 @@ void write_extent_buffer_chunk_tree_uuid(struct extent_buffer *eb,
57315731
BTRFS_FSID_SIZE);
57325732
}
57335733

5734-
void write_extent_buffer_fsid(struct extent_buffer *eb, const void *srcv)
5734+
void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *srcv)
57355735
{
57365736
char *kaddr;
57375737

@@ -5741,7 +5741,7 @@ void write_extent_buffer_fsid(struct extent_buffer *eb, const void *srcv)
57415741
BTRFS_FSID_SIZE);
57425742
}
57435743

5744-
void write_extent_buffer(struct extent_buffer *eb, const void *srcv,
5744+
void write_extent_buffer(const struct extent_buffer *eb, const void *srcv,
57455745
unsigned long start, unsigned long len)
57465746
{
57475747
size_t cur;
@@ -5772,7 +5772,7 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv,
57725772
}
57735773
}
57745774

5775-
void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,
5775+
void memzero_extent_buffer(const struct extent_buffer *eb, unsigned long start,
57765776
unsigned long len)
57775777
{
57785778
size_t cur;
@@ -5801,8 +5801,8 @@ void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,
58015801
}
58025802
}
58035803

5804-
void copy_extent_buffer_full(struct extent_buffer *dst,
5805-
struct extent_buffer *src)
5804+
void copy_extent_buffer_full(const struct extent_buffer *dst,
5805+
const struct extent_buffer *src)
58065806
{
58075807
int i;
58085808
int num_pages;
@@ -5815,7 +5815,8 @@ void copy_extent_buffer_full(struct extent_buffer *dst,
58155815
page_address(src->pages[i]));
58165816
}
58175817

5818-
void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
5818+
void copy_extent_buffer(const struct extent_buffer *dst,
5819+
const struct extent_buffer *src,
58195820
unsigned long dst_offset, unsigned long src_offset,
58205821
unsigned long len)
58215822
{
@@ -5860,7 +5861,7 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
58605861
* This helper hides the ugliness of finding the byte in an extent buffer which
58615862
* contains a given bit.
58625863
*/
5863-
static inline void eb_bitmap_offset(struct extent_buffer *eb,
5864+
static inline void eb_bitmap_offset(const struct extent_buffer *eb,
58645865
unsigned long start, unsigned long nr,
58655866
unsigned long *page_index,
58665867
size_t *page_offset)
@@ -5886,7 +5887,7 @@ static inline void eb_bitmap_offset(struct extent_buffer *eb,
58865887
* @start: offset of the bitmap item in the extent buffer
58875888
* @nr: bit number to test
58885889
*/
5889-
int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,
5890+
int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,
58905891
unsigned long nr)
58915892
{
58925893
u8 *kaddr;
@@ -5908,7 +5909,7 @@ int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,
59085909
* @pos: bit number of the first bit
59095910
* @len: number of bits to set
59105911
*/
5911-
void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,
5912+
void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long start,
59125913
unsigned long pos, unsigned long len)
59135914
{
59145915
u8 *kaddr;
@@ -5950,8 +5951,9 @@ void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,
59505951
* @pos: bit number of the first bit
59515952
* @len: number of bits to clear
59525953
*/
5953-
void extent_buffer_bitmap_clear(struct extent_buffer *eb, unsigned long start,
5954-
unsigned long pos, unsigned long len)
5954+
void extent_buffer_bitmap_clear(const struct extent_buffer *eb,
5955+
unsigned long start, unsigned long pos,
5956+
unsigned long len)
59555957
{
59565958
u8 *kaddr;
59575959
struct page *page;
@@ -6012,8 +6014,9 @@ static void copy_pages(struct page *dst_page, struct page *src_page,
60126014
memcpy(dst_kaddr + dst_off, src_kaddr + src_off, len);
60136015
}
60146016

6015-
void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
6016-
unsigned long src_offset, unsigned long len)
6017+
void memcpy_extent_buffer(const struct extent_buffer *dst,
6018+
unsigned long dst_offset, unsigned long src_offset,
6019+
unsigned long len)
60176020
{
60186021
struct btrfs_fs_info *fs_info = dst->fs_info;
60196022
size_t cur;
@@ -6057,8 +6060,9 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
60576060
}
60586061
}
60596062

6060-
void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
6061-
unsigned long src_offset, unsigned long len)
6063+
void memmove_extent_buffer(const struct extent_buffer *dst,
6064+
unsigned long dst_offset, unsigned long src_offset,
6065+
unsigned long len)
60626066
{
60636067
struct btrfs_fs_info *fs_info = dst->fs_info;
60646068
size_t cur;

‎fs/btrfs/extent_io.h

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
213213
u64 start, unsigned long len);
214214
struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
215215
u64 start);
216-
struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src);
216+
struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src);
217217
struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,
218218
u64 start);
219219
void free_extent_buffer(struct extent_buffer *eb);
@@ -231,7 +231,7 @@ static inline int num_extent_pages(const struct extent_buffer *eb)
231231
(eb->start >> PAGE_SHIFT);
232232
}
233233

234-
static inline int extent_buffer_uptodate(struct extent_buffer *eb)
234+
static inline int extent_buffer_uptodate(const struct extent_buffer *eb)
235235
{
236236
return test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
237237
}
@@ -244,33 +244,37 @@ void read_extent_buffer(const struct extent_buffer *eb, void *dst,
244244
int read_extent_buffer_to_user(const struct extent_buffer *eb,
245245
void __user *dst, unsigned long start,
246246
unsigned long len);
247-
void write_extent_buffer_fsid(struct extent_buffer *eb, const void *src);
248-
void write_extent_buffer_chunk_tree_uuid(struct extent_buffer *eb,
247+
void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *src);
248+
void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,
249249
const void *src);
250-
void write_extent_buffer(struct extent_buffer *eb, const void *src,
250+
void write_extent_buffer(const struct extent_buffer *eb, const void *src,
251251
unsigned long start, unsigned long len);
252-
void copy_extent_buffer_full(struct extent_buffer *dst,
253-
struct extent_buffer *src);
254-
void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
252+
void copy_extent_buffer_full(const struct extent_buffer *dst,
253+
const struct extent_buffer *src);
254+
void copy_extent_buffer(const struct extent_buffer *dst,
255+
const struct extent_buffer *src,
255256
unsigned long dst_offset, unsigned long src_offset,
256257
unsigned long len);
257-
void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
258-
unsigned long src_offset, unsigned long len);
259-
void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
260-
unsigned long src_offset, unsigned long len);
261-
void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,
258+
void memcpy_extent_buffer(const struct extent_buffer *dst,
259+
unsigned long dst_offset, unsigned long src_offset,
260+
unsigned long len);
261+
void memmove_extent_buffer(const struct extent_buffer *dst,
262+
unsigned long dst_offset, unsigned long src_offset,
262263
unsigned long len);
263-
int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,
264+
void memzero_extent_buffer(const struct extent_buffer *eb, unsigned long start,
265+
unsigned long len);
266+
int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,
264267
unsigned long pos);
265-
void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,
268+
void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long start,
266269
unsigned long pos, unsigned long len);
267-
void extent_buffer_bitmap_clear(struct extent_buffer *eb, unsigned long start,
268-
unsigned long pos, unsigned long len);
269-
void clear_extent_buffer_dirty(struct extent_buffer *eb);
270+
void extent_buffer_bitmap_clear(const struct extent_buffer *eb,
271+
unsigned long start, unsigned long pos,
272+
unsigned long len);
273+
void clear_extent_buffer_dirty(const struct extent_buffer *eb);
270274
bool set_extent_buffer_dirty(struct extent_buffer *eb);
271275
void set_extent_buffer_uptodate(struct extent_buffer *eb);
272276
void clear_extent_buffer_uptodate(struct extent_buffer *eb);
273-
int extent_buffer_under_io(struct extent_buffer *eb);
277+
int extent_buffer_under_io(const struct extent_buffer *eb);
274278
void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end);
275279
void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end);
276280
void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,
@@ -289,7 +293,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
289293
u64 length, u64 logical, struct page *page,
290294
unsigned int pg_offset, int mirror_num);
291295
void end_extent_writepage(struct page *page, int err, u64 start, u64 end);
292-
int btrfs_repair_eb_io_failure(struct extent_buffer *eb, int mirror_num);
296+
int btrfs_repair_eb_io_failure(const struct extent_buffer *eb, int mirror_num);
293297

294298
/*
295299
* When IO fails, either with EIO or csum verification fails, we

‎fs/btrfs/struct-funcs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token, \
131131
leres = cpu_to_le##bits(val); \
132132
write_extent_buffer(token->eb, &leres, member_offset, size); \
133133
} \
134-
void btrfs_set_##bits(struct extent_buffer *eb, void *ptr, \
134+
void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr, \
135135
unsigned long off, u##bits val) \
136136
{ \
137137
const unsigned long member_offset = (unsigned long)ptr + off; \

0 commit comments

Comments
 (0)