Skip to content

Commit 266914f

Browse files
fdmananakdave
fdmanana
authored and
kdave
committed
btrfs: rename set_extent_bit() to include a btrfs prefix
This is an exported function so it should have a 'btrfs_' prefix by convention, to make it clear it's btrfs specific and to avoid collisions with functions from elsewhere in the kernel. So rename it to btrfs_set_extent_bit(). Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent d2cce4c commit 266914f

File tree

11 files changed

+57
-56
lines changed

11 files changed

+57
-56
lines changed

‎fs/btrfs/block-group.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,9 +2216,9 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)
22162216
if (cache->start < BTRFS_SUPER_INFO_OFFSET) {
22172217
stripe_len = BTRFS_SUPER_INFO_OFFSET - cache->start;
22182218
cache->bytes_super += stripe_len;
2219-
ret = set_extent_bit(&fs_info->excluded_extents, cache->start,
2220-
cache->start + stripe_len - 1,
2221-
EXTENT_DIRTY, NULL);
2219+
ret = btrfs_set_extent_bit(&fs_info->excluded_extents, cache->start,
2220+
cache->start + stripe_len - 1,
2221+
EXTENT_DIRTY, NULL);
22222222
if (ret)
22232223
return ret;
22242224
}
@@ -2244,9 +2244,9 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)
22442244
cache->start + cache->length - logical[nr]);
22452245

22462246
cache->bytes_super += len;
2247-
ret = set_extent_bit(&fs_info->excluded_extents, logical[nr],
2248-
logical[nr] + len - 1,
2249-
EXTENT_DIRTY, NULL);
2247+
ret = btrfs_set_extent_bit(&fs_info->excluded_extents,
2248+
logical[nr], logical[nr] + len - 1,
2249+
EXTENT_DIRTY, NULL);
22502250
if (ret) {
22512251
kfree(logical);
22522252
return ret;
@@ -3736,8 +3736,8 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans,
37363736
spin_unlock(&cache->lock);
37373737
spin_unlock(&space_info->lock);
37383738

3739-
set_extent_bit(&trans->transaction->pinned_extents, bytenr,
3740-
bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);
3739+
btrfs_set_extent_bit(&trans->transaction->pinned_extents, bytenr,
3740+
bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);
37413741
}
37423742

37433743
spin_lock(&trans->transaction->dirty_bgs_lock);

‎fs/btrfs/defrag.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,8 +1173,8 @@ static int defrag_one_locked_target(struct btrfs_inode *inode,
11731173
btrfs_clear_extent_bit(&inode->io_tree, start, start + len - 1,
11741174
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |
11751175
EXTENT_DEFRAG, cached_state);
1176-
set_extent_bit(&inode->io_tree, start, start + len - 1,
1177-
EXTENT_DELALLOC | EXTENT_DEFRAG, cached_state);
1176+
btrfs_set_extent_bit(&inode->io_tree, start, start + len - 1,
1177+
EXTENT_DELALLOC | EXTENT_DEFRAG, cached_state);
11781178

11791179
/* Update the page status */
11801180
for (i = start_index - first_index; i <= last_index - first_index; i++) {

‎fs/btrfs/dev-replace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -797,8 +797,8 @@ static int btrfs_set_target_alloc_state(struct btrfs_device *srcdev,
797797
while (find_first_extent_bit(&srcdev->alloc_state, start,
798798
&found_start, &found_end,
799799
CHUNK_ALLOCATED, &cached_state)) {
800-
ret = set_extent_bit(&tgtdev->alloc_state, found_start,
801-
found_end, CHUNK_ALLOCATED, NULL);
800+
ret = btrfs_set_extent_bit(&tgtdev->alloc_state, found_start,
801+
found_end, CHUNK_ALLOCATED, NULL);
802802
if (ret)
803803
break;
804804
start = found_end + 1;

‎fs/btrfs/extent-io-tree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,8 +1256,8 @@ static int __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
12561256

12571257
}
12581258

1259-
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
1260-
u32 bits, struct extent_state **cached_state)
1259+
int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
1260+
u32 bits, struct extent_state **cached_state)
12611261
{
12621262
return __set_extent_bit(tree, start, end, bits, NULL, NULL,
12631263
cached_state, NULL);

‎fs/btrfs/extent-io-tree.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ static inline int btrfs_clear_extent_bits(struct extent_io_tree *tree, u64 start
199199

200200
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
201201
u32 bits, struct extent_changeset *changeset);
202-
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
203-
u32 bits, struct extent_state **cached_state);
202+
int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
203+
u32 bits, struct extent_state **cached_state);
204204

205205
static inline int btrfs_clear_extent_dirty(struct extent_io_tree *tree, u64 start,
206206
u64 end, struct extent_state **cached)

‎fs/btrfs/extent-tree.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,8 +2598,8 @@ static int pin_down_extent(struct btrfs_trans_handle *trans,
25982598
spin_unlock(&cache->lock);
25992599
spin_unlock(&cache->space_info->lock);
26002600

2601-
set_extent_bit(&trans->transaction->pinned_extents, bytenr,
2602-
bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);
2601+
btrfs_set_extent_bit(&trans->transaction->pinned_extents, bytenr,
2602+
bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);
26032603
return 0;
26042604
}
26052605

@@ -5065,17 +5065,17 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
50655065
* EXTENT bit to differentiate dirty pages.
50665066
*/
50675067
if (buf->log_index == 0)
5068-
set_extent_bit(&root->dirty_log_pages, buf->start,
5069-
buf->start + buf->len - 1,
5070-
EXTENT_DIRTY, NULL);
5068+
btrfs_set_extent_bit(&root->dirty_log_pages, buf->start,
5069+
buf->start + buf->len - 1,
5070+
EXTENT_DIRTY, NULL);
50715071
else
5072-
set_extent_bit(&root->dirty_log_pages, buf->start,
5073-
buf->start + buf->len - 1,
5074-
EXTENT_NEW, NULL);
5072+
btrfs_set_extent_bit(&root->dirty_log_pages, buf->start,
5073+
buf->start + buf->len - 1,
5074+
EXTENT_NEW, NULL);
50755075
} else {
50765076
buf->log_index = -1;
5077-
set_extent_bit(&trans->transaction->dirty_pages, buf->start,
5078-
buf->start + buf->len - 1, EXTENT_DIRTY, NULL);
5077+
btrfs_set_extent_bit(&trans->transaction->dirty_pages, buf->start,
5078+
buf->start + buf->len - 1, EXTENT_DIRTY, NULL);
50795079
}
50805080
/* this returns a buffer locked for blocking */
50815081
return buf;
@@ -6430,8 +6430,8 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)
64306430
ret = btrfs_issue_discard(device->bdev, start, len,
64316431
&bytes);
64326432
if (!ret)
6433-
set_extent_bit(&device->alloc_state, start,
6434-
start + bytes - 1, CHUNK_TRIMMED, NULL);
6433+
btrfs_set_extent_bit(&device->alloc_state, start,
6434+
start + bytes - 1, CHUNK_TRIMMED, NULL);
64356435
mutex_unlock(&fs_info->chunk_mutex);
64366436

64376437
if (ret)

‎fs/btrfs/file-item.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ int btrfs_inode_set_file_extent_range(struct btrfs_inode *inode, u64 start,
9191

9292
ASSERT(IS_ALIGNED(start + len, inode->root->fs_info->sectorsize));
9393

94-
return set_extent_bit(inode->file_extent_tree, start, start + len - 1,
95-
EXTENT_DIRTY, NULL);
94+
return btrfs_set_extent_bit(inode->file_extent_tree, start, start + len - 1,
95+
EXTENT_DIRTY, NULL);
9696
}
9797

9898
/*
@@ -430,9 +430,9 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
430430
if (btrfs_root_id(inode->root) == BTRFS_DATA_RELOC_TREE_OBJECTID) {
431431
u64 file_offset = bbio->file_offset + bio_offset;
432432

433-
set_extent_bit(&inode->io_tree, file_offset,
434-
file_offset + sectorsize - 1,
435-
EXTENT_NODATASUM, NULL);
433+
btrfs_set_extent_bit(&inode->io_tree, file_offset,
434+
file_offset + sectorsize - 1,
435+
EXTENT_NODATASUM, NULL);
436436
} else {
437437
btrfs_warn_rl(fs_info,
438438
"csum hole found for disk bytenr range [%llu, %llu)",

‎fs/btrfs/inode.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2674,9 +2674,9 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,
26742674
if (em_len > search_len)
26752675
em_len = search_len;
26762676

2677-
ret = set_extent_bit(&inode->io_tree, search_start,
2678-
search_start + em_len - 1,
2679-
EXTENT_DELALLOC_NEW, cached_state);
2677+
ret = btrfs_set_extent_bit(&inode->io_tree, search_start,
2678+
search_start + em_len - 1,
2679+
EXTENT_DELALLOC_NEW, cached_state);
26802680
next:
26812681
search_start = extent_map_end(em);
26822682
free_extent_map(em);
@@ -2709,8 +2709,8 @@ int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
27092709
return ret;
27102710
}
27112711

2712-
return set_extent_bit(&inode->io_tree, start, end,
2713-
EXTENT_DELALLOC | extra_bits, cached_state);
2712+
return btrfs_set_extent_bit(&inode->io_tree, start, end,
2713+
EXTENT_DELALLOC | extra_bits, cached_state);
27142714
}
27152715

27162716
/* see btrfs_writepage_start_hook for details on why this is required */
@@ -4893,8 +4893,8 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,
48934893
btrfs_unlock_extent(io_tree, block_start, block_end, &cached_state);
48944894

48954895
if (only_release_metadata)
4896-
set_extent_bit(&inode->io_tree, block_start, block_end,
4897-
EXTENT_NORESERVE, NULL);
4896+
btrfs_set_extent_bit(&inode->io_tree, block_start, block_end,
4897+
EXTENT_NORESERVE, NULL);
48984898

48994899
out_unlock:
49004900
if (ret) {

‎fs/btrfs/relocation.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ static void mark_block_processed(struct reloc_control *rc,
178178
in_range(node->bytenr, rc->block_group->start,
179179
rc->block_group->length)) {
180180
blocksize = rc->extent_root->fs_info->nodesize;
181-
set_extent_bit(&rc->processed_blocks, node->bytenr,
182-
node->bytenr + blocksize - 1, EXTENT_DIRTY, NULL);
181+
btrfs_set_extent_bit(&rc->processed_blocks, node->bytenr,
182+
node->bytenr + blocksize - 1, EXTENT_DIRTY,
183+
NULL);
183184
}
184185
node->processed = 1;
185186
}
@@ -2929,9 +2930,9 @@ static int relocate_one_folio(struct reloc_control *rc,
29292930
u64 boundary_end = boundary_start +
29302931
fs_info->sectorsize - 1;
29312932

2932-
set_extent_bit(&BTRFS_I(inode)->io_tree,
2933-
boundary_start, boundary_end,
2934-
EXTENT_BOUNDARY, NULL);
2933+
btrfs_set_extent_bit(&BTRFS_I(inode)->io_tree,
2934+
boundary_start, boundary_end,
2935+
EXTENT_BOUNDARY, NULL);
29352936
}
29362937
btrfs_unlock_extent(&BTRFS_I(inode)->io_tree, clamped_start, clamped_end,
29372938
&cached_state);

‎fs/btrfs/tests/extent-io-tests.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int test_find_delalloc(u32 sectorsize, u32 nodesize)
175175
* |--- delalloc ---|
176176
* |--- search ---|
177177
*/
178-
set_extent_bit(tmp, 0, sectorsize - 1, EXTENT_DELALLOC, NULL);
178+
btrfs_set_extent_bit(tmp, 0, sectorsize - 1, EXTENT_DELALLOC, NULL);
179179
start = 0;
180180
end = start + PAGE_SIZE - 1;
181181
found = find_lock_delalloc_range(inode, page_folio(locked_page), &start,
@@ -206,7 +206,7 @@ static int test_find_delalloc(u32 sectorsize, u32 nodesize)
206206
test_err("couldn't find the locked page");
207207
goto out_bits;
208208
}
209-
set_extent_bit(tmp, sectorsize, max_bytes - 1, EXTENT_DELALLOC, NULL);
209+
btrfs_set_extent_bit(tmp, sectorsize, max_bytes - 1, EXTENT_DELALLOC, NULL);
210210
start = test_start;
211211
end = start + PAGE_SIZE - 1;
212212
found = find_lock_delalloc_range(inode, page_folio(locked_page), &start,
@@ -261,7 +261,7 @@ static int test_find_delalloc(u32 sectorsize, u32 nodesize)
261261
*
262262
* We are re-using our test_start from above since it works out well.
263263
*/
264-
set_extent_bit(tmp, max_bytes, total_dirty - 1, EXTENT_DELALLOC, NULL);
264+
btrfs_set_extent_bit(tmp, max_bytes, total_dirty - 1, EXTENT_DELALLOC, NULL);
265265
start = test_start;
266266
end = start + PAGE_SIZE - 1;
267267
found = find_lock_delalloc_range(inode, page_folio(locked_page), &start,
@@ -577,8 +577,8 @@ static int test_find_first_clear_extent_bit(void)
577577
* Set 1M-4M alloc/discard and 32M-64M thus leaving a hole between
578578
* 4M-32M
579579
*/
580-
set_extent_bit(&tree, SZ_1M, SZ_4M - 1,
581-
CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);
580+
btrfs_set_extent_bit(&tree, SZ_1M, SZ_4M - 1,
581+
CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);
582582

583583
find_first_clear_extent_bit(&tree, SZ_512K, &start, &end,
584584
CHUNK_TRIMMED | CHUNK_ALLOCATED);
@@ -590,8 +590,8 @@ static int test_find_first_clear_extent_bit(void)
590590
}
591591

592592
/* Now add 32M-64M so that we have a hole between 4M-32M */
593-
set_extent_bit(&tree, SZ_32M, SZ_64M - 1,
594-
CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);
593+
btrfs_set_extent_bit(&tree, SZ_32M, SZ_64M - 1,
594+
CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);
595595

596596
/*
597597
* Request first hole starting at 12M, we should get 4M-32M
@@ -622,7 +622,7 @@ static int test_find_first_clear_extent_bit(void)
622622
* Set 64M-72M with CHUNK_ALLOC flag, then search for CHUNK_TRIMMED flag
623623
* being unset in this range, we should get the entry in range 64M-72M
624624
*/
625-
set_extent_bit(&tree, SZ_64M, SZ_64M + SZ_8M - 1, CHUNK_ALLOCATED, NULL);
625+
btrfs_set_extent_bit(&tree, SZ_64M, SZ_64M + SZ_8M - 1, CHUNK_ALLOCATED, NULL);
626626
find_first_clear_extent_bit(&tree, SZ_64M + SZ_1M, &start, &end,
627627
CHUNK_TRIMMED);
628628

0 commit comments

Comments
 (0)