Skip to content

Commit 84d6127

Browse files
fdmananakdave
fdmanana
authored and
kdave
committed
btrfs: rename remaining exported functions from extent-io-tree.h
Rename the remaning exported functions that don't have a 'btrfs_' prefix. By convention exported functions should have such prefix to make it clear they are btrfs specific and to avoid collisions with functions from elsewhere in the kernel. Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> 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 39bf3fe commit 84d6127

File tree

5 files changed

+37
-35
lines changed

5 files changed

+37
-35
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,9 +1280,9 @@ int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
12801280
*
12811281
* All allocations are done with GFP_NOFS.
12821282
*/
1283-
int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
1284-
u32 bits, u32 clear_bits,
1285-
struct extent_state **cached_state)
1283+
int btrfs_convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
1284+
u32 bits, u32 clear_bits,
1285+
struct extent_state **cached_state)
12861286
{
12871287
struct extent_state *state;
12881288
struct extent_state *prealloc = NULL;
@@ -1805,8 +1805,8 @@ bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 b
18051805
}
18061806

18071807
/* Wrappers around set/clear extent bit */
1808-
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
1809-
u32 bits, struct extent_changeset *changeset)
1808+
int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
1809+
u32 bits, struct extent_changeset *changeset)
18101810
{
18111811
/*
18121812
* We don't support EXTENT_LOCK_BITS yet, as current changeset will
@@ -1818,8 +1818,8 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
18181818
return __set_extent_bit(tree, start, end, bits, NULL, NULL, NULL, changeset);
18191819
}
18201820

1821-
int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
1822-
u32 bits, struct extent_changeset *changeset)
1821+
int btrfs_clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
1822+
u32 bits, struct extent_changeset *changeset)
18231823
{
18241824
/*
18251825
* Don't support EXTENT_LOCK_BITS case, same reason as
@@ -1873,13 +1873,13 @@ int btrfs_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, u32
18731873
return err;
18741874
}
18751875

1876-
void __cold extent_state_free_cachep(void)
1876+
void __cold btrfs_extent_state_free_cachep(void)
18771877
{
18781878
btrfs_extent_state_leak_debug_check();
18791879
kmem_cache_destroy(extent_state_cache);
18801880
}
18811881

1882-
int __init extent_state_init_cachep(void)
1882+
int __init btrfs_extent_state_init_cachep(void)
18831883
{
18841884
extent_state_cache = kmem_cache_create("btrfs_extent_state",
18851885
sizeof(struct extent_state), 0, 0,

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ static inline bool btrfs_try_lock_extent(struct extent_io_tree *tree, u64 start,
157157
return btrfs_try_lock_extent_bits(tree, start, end, EXTENT_LOCKED, cached);
158158
}
159159

160-
int __init extent_state_init_cachep(void);
161-
void __cold extent_state_free_cachep(void);
160+
int __init btrfs_extent_state_init_cachep(void);
161+
void __cold btrfs_extent_state_free_cachep(void);
162162

163163
u64 btrfs_count_range_bits(struct extent_io_tree *tree,
164164
u64 *start, u64 search_end,
@@ -171,8 +171,8 @@ bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 b
171171
bool btrfs_test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit);
172172
void btrfs_get_range_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 *bits,
173173
struct extent_state **cached_state);
174-
int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
175-
u32 bits, struct extent_changeset *changeset);
174+
int btrfs_clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
175+
u32 bits, struct extent_changeset *changeset);
176176
int btrfs_clear_extent_bit_changeset(struct extent_io_tree *tree, u64 start, u64 end,
177177
u32 bits, struct extent_state **cached,
178178
struct extent_changeset *changeset);
@@ -197,8 +197,8 @@ static inline int btrfs_clear_extent_bits(struct extent_io_tree *tree, u64 start
197197
return btrfs_clear_extent_bit(tree, start, end, bits, NULL);
198198
}
199199

200-
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
201-
u32 bits, struct extent_changeset *changeset);
200+
int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
201+
u32 bits, struct extent_changeset *changeset);
202202
int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
203203
u32 bits, struct extent_state **cached_state);
204204

@@ -210,9 +210,9 @@ static inline int btrfs_clear_extent_dirty(struct extent_io_tree *tree, u64 star
210210
EXTENT_DO_ACCOUNTING, cached);
211211
}
212212

213-
int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
214-
u32 bits, u32 clear_bits,
215-
struct extent_state **cached_state);
213+
int btrfs_convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
214+
u32 bits, u32 clear_bits,
215+
struct extent_state **cached_state);
216216

217217
bool btrfs_find_first_extent_bit(struct extent_io_tree *tree, u64 start,
218218
u64 *start_ret, u64 *end_ret, u32 bits,

‎fs/btrfs/qgroup.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4232,8 +4232,9 @@ static int qgroup_reserve_data(struct btrfs_inode *inode,
42324232
reserved = *reserved_ret;
42334233
/* Record already reserved space */
42344234
orig_reserved = reserved->bytes_changed;
4235-
ret = set_record_extent_bits(&inode->io_tree, start,
4236-
start + len -1, EXTENT_QGROUP_RESERVED, reserved);
4235+
ret = btrfs_set_record_extent_bits(&inode->io_tree, start,
4236+
start + len - 1, EXTENT_QGROUP_RESERVED,
4237+
reserved);
42374238

42384239
/* Newly reserved space */
42394240
to_reserve = reserved->bytes_changed - orig_reserved;
@@ -4326,9 +4327,10 @@ static int qgroup_free_reserved_data(struct btrfs_inode *inode,
43264327
* EXTENT_QGROUP_RESERVED, we won't double free.
43274328
* So not need to rush.
43284329
*/
4329-
ret = clear_record_extent_bits(&inode->io_tree, free_start,
4330-
free_start + free_len - 1,
4331-
EXTENT_QGROUP_RESERVED, &changeset);
4330+
ret = btrfs_clear_record_extent_bits(&inode->io_tree, free_start,
4331+
free_start + free_len - 1,
4332+
EXTENT_QGROUP_RESERVED,
4333+
&changeset);
43324334
if (ret < 0)
43334335
goto out;
43344336
freed += changeset.bytes_changed;
@@ -4352,18 +4354,18 @@ static int __btrfs_qgroup_release_data(struct btrfs_inode *inode,
43524354
int ret;
43534355

43544356
if (btrfs_qgroup_mode(inode->root->fs_info) == BTRFS_QGROUP_MODE_DISABLED) {
4355-
return clear_record_extent_bits(&inode->io_tree, start,
4356-
start + len - 1,
4357-
EXTENT_QGROUP_RESERVED, NULL);
4357+
return btrfs_clear_record_extent_bits(&inode->io_tree, start,
4358+
start + len - 1,
4359+
EXTENT_QGROUP_RESERVED, NULL);
43584360
}
43594361

43604362
/* In release case, we shouldn't have @reserved */
43614363
WARN_ON(!free && reserved);
43624364
if (free && reserved)
43634365
return qgroup_free_reserved_data(inode, reserved, start, len, released);
43644366
extent_changeset_init(&changeset);
4365-
ret = clear_record_extent_bits(&inode->io_tree, start, start + len -1,
4366-
EXTENT_QGROUP_RESERVED, &changeset);
4367+
ret = btrfs_clear_record_extent_bits(&inode->io_tree, start, start + len - 1,
4368+
EXTENT_QGROUP_RESERVED, &changeset);
43674369
if (ret < 0)
43684370
goto out;
43694371

@@ -4611,8 +4613,8 @@ void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)
46114613
int ret;
46124614

46134615
extent_changeset_init(&changeset);
4614-
ret = clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,
4615-
EXTENT_QGROUP_RESERVED, &changeset);
4616+
ret = btrfs_clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,
4617+
EXTENT_QGROUP_RESERVED, &changeset);
46164618

46174619
WARN_ON(ret < 0);
46184620
if (WARN_ON(changeset.bytes_changed)) {

‎fs/btrfs/super.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2525,8 +2525,8 @@ static const struct init_sequence mod_init_seq[] = {
25252525
.init_func = btrfs_free_space_init,
25262526
.exit_func = btrfs_free_space_exit,
25272527
}, {
2528-
.init_func = extent_state_init_cachep,
2529-
.exit_func = extent_state_free_cachep,
2528+
.init_func = btrfs_extent_state_init_cachep,
2529+
.exit_func = btrfs_extent_state_free_cachep,
25302530
}, {
25312531
.init_func = extent_buffer_init_cachep,
25322532
.exit_func = extent_buffer_free_cachep,

‎fs/btrfs/transaction.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,9 +1132,9 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
11321132
mark, &cached_state)) {
11331133
bool wait_writeback = false;
11341134

1135-
ret = convert_extent_bit(dirty_pages, start, end,
1136-
EXTENT_NEED_WAIT,
1137-
mark, &cached_state);
1135+
ret = btrfs_convert_extent_bit(dirty_pages, start, end,
1136+
EXTENT_NEED_WAIT,
1137+
mark, &cached_state);
11381138
/*
11391139
* convert_extent_bit can return -ENOMEM, which is most of the
11401140
* time a temporary error. So when it happens, ignore the error

0 commit comments

Comments
 (0)