Skip to content

Commit 33523a0

Browse files
fdmananakdave
fdmanana
authored and
kdave
committed
btrfs: add btrfs prefix to free space tree exported functions
A few of the free space tree exported functions have a 'btrfs_' prefix in their name, but most don't. Not only is this inconsistent, the preferred style is to have such a prefix, to avoid potential collisions in the future with other kernel code and offer a somewhat better readibility by making it obvious in calls sites that we are calling btrfs specific code. So add the 'btrfs_' prefix to all free space tree functions that are missing it. Reviewed-by: Boris Burkov <boris@bur.io> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent deb3a8a commit 33523a0

File tree

5 files changed

+125
-129
lines changed

5 files changed

+125
-129
lines changed

‎fs/btrfs/block-group.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ static noinline void caching_thread(struct btrfs_work *work)
877877
*/
878878
if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE) &&
879879
!(test_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &fs_info->flags)))
880-
ret = load_free_space_tree(caching_ctl);
880+
ret = btrfs_load_free_space_tree(caching_ctl);
881881
else
882882
ret = load_extent_tree_free(caching_ctl);
883883
done:
@@ -1235,7 +1235,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
12351235
* another task to attempt to create another block group with the same
12361236
* item key (and failing with -EEXIST and a transaction abort).
12371237
*/
1238-
ret = remove_block_group_free_space(trans, block_group);
1238+
ret = btrfs_remove_block_group_free_space(trans, block_group);
12391239
if (ret)
12401240
goto out;
12411241

@@ -2372,7 +2372,7 @@ static int read_one_block_group(struct btrfs_fs_info *info,
23722372
cache->global_root_id = btrfs_stack_block_group_chunk_objectid(bgi);
23732373
cache->space_info = btrfs_find_space_info(info, cache->flags);
23742374

2375-
set_free_space_tree_thresholds(cache);
2375+
btrfs_set_free_space_tree_thresholds(cache);
23762376

23772377
if (need_clear) {
23782378
/*
@@ -2791,7 +2791,7 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
27912791
block_group->length);
27922792
if (ret)
27932793
btrfs_abort_transaction(trans, ret);
2794-
add_block_group_free_space(trans, block_group);
2794+
btrfs_add_block_group_free_space(trans, block_group);
27952795

27962796
/*
27972797
* If we restriped during balance, we may have added a new raid
@@ -2889,7 +2889,7 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran
28892889
set_bit(BLOCK_GROUP_FLAG_NEW, &cache->runtime_flags);
28902890

28912891
cache->length = size;
2892-
set_free_space_tree_thresholds(cache);
2892+
btrfs_set_free_space_tree_thresholds(cache);
28932893
cache->flags = type;
28942894
cache->cached = BTRFS_CACHE_FINISHED;
28952895
cache->global_root_id = calculate_global_root_id(fs_info, cache->start);

‎fs/btrfs/extent-tree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3000,7 +3000,7 @@ static int do_free_extent_accounting(struct btrfs_trans_handle *trans,
30003000
return ret;
30013001
}
30023002

3003-
ret = add_to_free_space_tree(trans, bytenr, num_bytes);
3003+
ret = btrfs_add_to_free_space_tree(trans, bytenr, num_bytes);
30043004
if (ret) {
30053005
btrfs_abort_transaction(trans, ret);
30063006
return ret;
@@ -4784,7 +4784,7 @@ static int alloc_reserved_extent(struct btrfs_trans_handle *trans, u64 bytenr,
47844784
struct btrfs_fs_info *fs_info = trans->fs_info;
47854785
int ret;
47864786

4787-
ret = remove_from_free_space_tree(trans, bytenr, num_bytes);
4787+
ret = btrfs_remove_from_free_space_tree(trans, bytenr, num_bytes);
47884788
if (ret)
47894789
return ret;
47904790

‎fs/btrfs/free-space-tree.c

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static struct btrfs_root *btrfs_free_space_root(
3535
return btrfs_global_root(block_group->fs_info, &key);
3636
}
3737

38-
void set_free_space_tree_thresholds(struct btrfs_block_group *cache)
38+
void btrfs_set_free_space_tree_thresholds(struct btrfs_block_group *cache)
3939
{
4040
u32 bitmap_range;
4141
size_t bitmap_size;
@@ -94,7 +94,7 @@ static int add_new_free_space_info(struct btrfs_trans_handle *trans,
9494
}
9595

9696
EXPORT_FOR_TESTS
97-
struct btrfs_free_space_info *search_free_space_info(
97+
struct btrfs_free_space_info *btrfs_search_free_space_info(
9898
struct btrfs_trans_handle *trans,
9999
struct btrfs_block_group *block_group,
100100
struct btrfs_path *path, int cow)
@@ -198,9 +198,9 @@ static void le_bitmap_set(unsigned long *map, unsigned int start, int len)
198198
}
199199

200200
EXPORT_FOR_TESTS
201-
int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
202-
struct btrfs_block_group *block_group,
203-
struct btrfs_path *path)
201+
int btrfs_convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
202+
struct btrfs_block_group *block_group,
203+
struct btrfs_path *path)
204204
{
205205
struct btrfs_fs_info *fs_info = trans->fs_info;
206206
struct btrfs_root *root = btrfs_free_space_root(block_group);
@@ -278,7 +278,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
278278
btrfs_release_path(path);
279279
}
280280

281-
info = search_free_space_info(trans, block_group, path, 1);
281+
info = btrfs_search_free_space_info(trans, block_group, path, 1);
282282
if (IS_ERR(info)) {
283283
ret = PTR_ERR(info);
284284
btrfs_abort_transaction(trans, ret);
@@ -340,9 +340,9 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
340340
}
341341

342342
EXPORT_FOR_TESTS
343-
int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
344-
struct btrfs_block_group *block_group,
345-
struct btrfs_path *path)
343+
int btrfs_convert_free_space_to_extents(struct btrfs_trans_handle *trans,
344+
struct btrfs_block_group *block_group,
345+
struct btrfs_path *path)
346346
{
347347
struct btrfs_fs_info *fs_info = trans->fs_info;
348348
struct btrfs_root *root = btrfs_free_space_root(block_group);
@@ -425,7 +425,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
425425
btrfs_release_path(path);
426426
}
427427

428-
info = search_free_space_info(trans, block_group, path, 1);
428+
info = btrfs_search_free_space_info(trans, block_group, path, 1);
429429
if (IS_ERR(info)) {
430430
ret = PTR_ERR(info);
431431
btrfs_abort_transaction(trans, ret);
@@ -490,7 +490,7 @@ static int update_free_space_extent_count(struct btrfs_trans_handle *trans,
490490
if (new_extents == 0)
491491
return 0;
492492

493-
info = search_free_space_info(trans, block_group, path, 1);
493+
info = btrfs_search_free_space_info(trans, block_group, path, 1);
494494
if (IS_ERR(info))
495495
return PTR_ERR(info);
496496

@@ -503,18 +503,18 @@ static int update_free_space_extent_count(struct btrfs_trans_handle *trans,
503503

504504
if (!(flags & BTRFS_FREE_SPACE_USING_BITMAPS) &&
505505
extent_count > block_group->bitmap_high_thresh) {
506-
ret = convert_free_space_to_bitmaps(trans, block_group, path);
506+
ret = btrfs_convert_free_space_to_bitmaps(trans, block_group, path);
507507
} else if ((flags & BTRFS_FREE_SPACE_USING_BITMAPS) &&
508508
extent_count < block_group->bitmap_low_thresh) {
509-
ret = convert_free_space_to_extents(trans, block_group, path);
509+
ret = btrfs_convert_free_space_to_extents(trans, block_group, path);
510510
}
511511

512512
return ret;
513513
}
514514

515515
EXPORT_FOR_TESTS
516-
bool free_space_test_bit(struct btrfs_block_group *block_group,
517-
struct btrfs_path *path, u64 offset)
516+
bool btrfs_free_space_test_bit(struct btrfs_block_group *block_group,
517+
struct btrfs_path *path, u64 offset)
518518
{
519519
struct extent_buffer *leaf;
520520
struct btrfs_key key;
@@ -632,7 +632,7 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,
632632
if (ret)
633633
return ret;
634634

635-
prev_bit_set = free_space_test_bit(block_group, path, prev_block);
635+
prev_bit_set = btrfs_free_space_test_bit(block_group, path, prev_block);
636636

637637
/* The previous block may have been in the previous bitmap. */
638638
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
@@ -680,7 +680,7 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,
680680
return ret;
681681
}
682682

683-
next_bit_set = free_space_test_bit(block_group, path, end);
683+
next_bit_set = btrfs_free_space_test_bit(block_group, path, end);
684684
}
685685

686686
if (remove) {
@@ -792,9 +792,9 @@ static int remove_free_space_extent(struct btrfs_trans_handle *trans,
792792
}
793793

794794
EXPORT_FOR_TESTS
795-
int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,
796-
struct btrfs_block_group *block_group,
797-
struct btrfs_path *path, u64 start, u64 size)
795+
int __btrfs_remove_from_free_space_tree(struct btrfs_trans_handle *trans,
796+
struct btrfs_block_group *block_group,
797+
struct btrfs_path *path, u64 start, u64 size)
798798
{
799799
struct btrfs_free_space_info *info;
800800
u32 flags;
@@ -804,7 +804,7 @@ int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,
804804
if (ret)
805805
return ret;
806806

807-
info = search_free_space_info(NULL, block_group, path, 0);
807+
info = btrfs_search_free_space_info(NULL, block_group, path, 0);
808808
if (IS_ERR(info))
809809
return PTR_ERR(info);
810810
flags = btrfs_free_space_flags(path->nodes[0], info);
@@ -819,8 +819,8 @@ int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,
819819
}
820820
}
821821

822-
int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
823-
u64 start, u64 size)
822+
int btrfs_remove_from_free_space_tree(struct btrfs_trans_handle *trans,
823+
u64 start, u64 size)
824824
{
825825
struct btrfs_block_group *block_group;
826826
struct btrfs_path *path;
@@ -845,8 +845,7 @@ int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
845845
}
846846

847847
mutex_lock(&block_group->free_space_lock);
848-
ret = __remove_from_free_space_tree(trans, block_group, path, start,
849-
size);
848+
ret = __btrfs_remove_from_free_space_tree(trans, block_group, path, start, size);
850849
mutex_unlock(&block_group->free_space_lock);
851850
if (ret)
852851
btrfs_abort_transaction(trans, ret);
@@ -981,9 +980,9 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans,
981980
}
982981

983982
EXPORT_FOR_TESTS
984-
int __add_to_free_space_tree(struct btrfs_trans_handle *trans,
985-
struct btrfs_block_group *block_group,
986-
struct btrfs_path *path, u64 start, u64 size)
983+
int __btrfs_add_to_free_space_tree(struct btrfs_trans_handle *trans,
984+
struct btrfs_block_group *block_group,
985+
struct btrfs_path *path, u64 start, u64 size)
987986
{
988987
struct btrfs_free_space_info *info;
989988
u32 flags;
@@ -993,7 +992,7 @@ int __add_to_free_space_tree(struct btrfs_trans_handle *trans,
993992
if (ret)
994993
return ret;
995994

996-
info = search_free_space_info(NULL, block_group, path, 0);
995+
info = btrfs_search_free_space_info(NULL, block_group, path, 0);
997996
if (IS_ERR(info))
998997
return PTR_ERR(info);
999998
flags = btrfs_free_space_flags(path->nodes[0], info);
@@ -1008,8 +1007,8 @@ int __add_to_free_space_tree(struct btrfs_trans_handle *trans,
10081007
}
10091008
}
10101009

1011-
int add_to_free_space_tree(struct btrfs_trans_handle *trans,
1012-
u64 start, u64 size)
1010+
int btrfs_add_to_free_space_tree(struct btrfs_trans_handle *trans,
1011+
u64 start, u64 size)
10131012
{
10141013
struct btrfs_block_group *block_group;
10151014
struct btrfs_path *path;
@@ -1034,7 +1033,7 @@ int add_to_free_space_tree(struct btrfs_trans_handle *trans,
10341033
}
10351034

10361035
mutex_lock(&block_group->free_space_lock);
1037-
ret = __add_to_free_space_tree(trans, block_group, path, start, size);
1036+
ret = __btrfs_add_to_free_space_tree(trans, block_group, path, start, size);
10381037
mutex_unlock(&block_group->free_space_lock);
10391038
if (ret)
10401039
btrfs_abort_transaction(trans, ret);
@@ -1114,11 +1113,11 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,
11141113
break;
11151114

11161115
if (start < key.objectid) {
1117-
ret = __add_to_free_space_tree(trans,
1118-
block_group,
1119-
path2, start,
1120-
key.objectid -
1121-
start);
1116+
ret = __btrfs_add_to_free_space_tree(trans,
1117+
block_group,
1118+
path2, start,
1119+
key.objectid -
1120+
start);
11221121
if (ret)
11231122
goto out_locked;
11241123
}
@@ -1137,8 +1136,8 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,
11371136
goto out_locked;
11381137
}
11391138
if (start < end) {
1140-
ret = __add_to_free_space_tree(trans, block_group, path2,
1141-
start, end - start);
1139+
ret = __btrfs_add_to_free_space_tree(trans, block_group, path2,
1140+
start, end - start);
11421141
if (ret)
11431142
goto out_locked;
11441143
}
@@ -1424,8 +1423,8 @@ static int __add_block_group_free_space(struct btrfs_trans_handle *trans,
14241423
goto out;
14251424
}
14261425

1427-
ret = __add_to_free_space_tree(trans, block_group, path,
1428-
block_group->start, block_group->length);
1426+
ret = __btrfs_add_to_free_space_tree(trans, block_group, path,
1427+
block_group->start, block_group->length);
14291428
if (ret)
14301429
btrfs_abort_transaction(trans, ret);
14311430

@@ -1436,8 +1435,8 @@ static int __add_block_group_free_space(struct btrfs_trans_handle *trans,
14361435
return ret;
14371436
}
14381437

1439-
int add_block_group_free_space(struct btrfs_trans_handle *trans,
1440-
struct btrfs_block_group *block_group)
1438+
int btrfs_add_block_group_free_space(struct btrfs_trans_handle *trans,
1439+
struct btrfs_block_group *block_group)
14411440
{
14421441
int ret;
14431442

@@ -1450,8 +1449,8 @@ int add_block_group_free_space(struct btrfs_trans_handle *trans,
14501449
return ret;
14511450
}
14521451

1453-
int remove_block_group_free_space(struct btrfs_trans_handle *trans,
1454-
struct btrfs_block_group *block_group)
1452+
int btrfs_remove_block_group_free_space(struct btrfs_trans_handle *trans,
1453+
struct btrfs_block_group *block_group)
14551454
{
14561455
struct btrfs_root *root = btrfs_free_space_root(block_group);
14571456
struct btrfs_path *path;
@@ -1570,7 +1569,7 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,
15701569
while (offset < key.objectid + key.offset) {
15711570
bool bit_set;
15721571

1573-
bit_set = free_space_test_bit(block_group, path, offset);
1572+
bit_set = btrfs_free_space_test_bit(block_group, path, offset);
15741573
if (!prev_bit_set && bit_set) {
15751574
extent_start = offset;
15761575
} else if (prev_bit_set && !bit_set) {
@@ -1673,7 +1672,7 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl,
16731672
return 0;
16741673
}
16751674

1676-
int load_free_space_tree(struct btrfs_caching_control *caching_ctl)
1675+
int btrfs_load_free_space_tree(struct btrfs_caching_control *caching_ctl)
16771676
{
16781677
struct btrfs_block_group *block_group;
16791678
struct btrfs_free_space_info *info;
@@ -1694,7 +1693,7 @@ int load_free_space_tree(struct btrfs_caching_control *caching_ctl)
16941693
path->search_commit_root = 1;
16951694
path->reada = READA_FORWARD;
16961695

1697-
info = search_free_space_info(NULL, block_group, path, 0);
1696+
info = btrfs_search_free_space_info(NULL, block_group, path, 0);
16981697
if (IS_ERR(info))
16991698
return PTR_ERR(info);
17001699

0 commit comments

Comments
 (0)