Skip to content

Commit d2cce4c

Browse files
fdmananakdave
fdmanana
authored and
kdave
committed
btrfs: rename the functions to clear bits for an extent range
These functions are exported so they should have a 'btrfs_' prefix by convention, to make it clear they are btrfs specific and to avoid collisions with functions from elsewhere in the kernel. One of them has a double underscore prefix which is also discouraged. So remove double underscore prefix where applicable and add a 'btrfs_' prefix to their name to make it clear they are from btrfs. 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 7968120 commit d2cce4c

19 files changed

+112
-108
lines changed

‎fs/btrfs/block-group.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,8 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl)
832832

833833
static inline void btrfs_free_excluded_extents(const struct btrfs_block_group *bg)
834834
{
835-
clear_extent_bits(&bg->fs_info->excluded_extents, bg->start,
836-
bg->start + bg->length - 1, EXTENT_DIRTY);
835+
btrfs_clear_extent_bits(&bg->fs_info->excluded_extents, bg->start,
836+
bg->start + bg->length - 1, EXTENT_DIRTY);
837837
}
838838

839839
static noinline void caching_thread(struct btrfs_work *work)
@@ -1437,14 +1437,14 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans,
14371437
*/
14381438
mutex_lock(&fs_info->unused_bg_unpin_mutex);
14391439
if (prev_trans) {
1440-
ret = clear_extent_bits(&prev_trans->pinned_extents, start, end,
1441-
EXTENT_DIRTY);
1440+
ret = btrfs_clear_extent_bits(&prev_trans->pinned_extents, start, end,
1441+
EXTENT_DIRTY);
14421442
if (ret)
14431443
goto out;
14441444
}
14451445

1446-
ret = clear_extent_bits(&trans->transaction->pinned_extents, start, end,
1447-
EXTENT_DIRTY);
1446+
ret = btrfs_clear_extent_bits(&trans->transaction->pinned_extents, start, end,
1447+
EXTENT_DIRTY);
14481448
out:
14491449
mutex_unlock(&fs_info->unused_bg_unpin_mutex);
14501450
if (prev_trans)

‎fs/btrfs/defrag.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,9 +1170,9 @@ static int defrag_one_locked_target(struct btrfs_inode *inode,
11701170
ret = btrfs_delalloc_reserve_space(inode, &data_reserved, start, len);
11711171
if (ret < 0)
11721172
return ret;
1173-
clear_extent_bit(&inode->io_tree, start, start + len - 1,
1174-
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |
1175-
EXTENT_DEFRAG, cached_state);
1173+
btrfs_clear_extent_bit(&inode->io_tree, start, start + len - 1,
1174+
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |
1175+
EXTENT_DEFRAG, cached_state);
11761176
set_extent_bit(&inode->io_tree, start, start + len - 1,
11771177
EXTENT_DELALLOC | EXTENT_DEFRAG, cached_state);
11781178

‎fs/btrfs/direct-io.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,
575575
if (write)
576576
unlock_bits |= EXTENT_DIO_LOCKED;
577577

578-
clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,
579-
unlock_bits, &cached_state);
578+
btrfs_clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,
579+
unlock_bits, &cached_state);
580580

581581
/* We didn't use everything, unlock the dio extent for the remainder. */
582582
if (!write && (start + len) < lockend)
@@ -591,8 +591,8 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,
591591
* to update this, be explicit that we expect EXTENT_LOCKED and
592592
* EXTENT_DIO_LOCKED to be set here, and so that's what we're clearing.
593593
*/
594-
clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,
595-
EXTENT_LOCKED | EXTENT_DIO_LOCKED, &cached_state);
594+
btrfs_clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,
595+
EXTENT_LOCKED | EXTENT_DIO_LOCKED, &cached_state);
596596
err:
597597
if (dio_data->data_space_reserved) {
598598
btrfs_free_reserved_data_space(BTRFS_I(inode),

‎fs/btrfs/disk-io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4693,7 +4693,7 @@ static void btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
46934693

46944694
while (find_first_extent_bit(dirty_pages, start, &start, &end,
46954695
mark, NULL)) {
4696-
clear_extent_bits(dirty_pages, start, end, mark);
4696+
btrfs_clear_extent_bits(dirty_pages, start, end, mark);
46974697
while (start <= end) {
46984698
eb = find_extent_buffer(fs_info, start);
46994699
start += fs_info->nodesize;
@@ -4732,7 +4732,7 @@ static void btrfs_destroy_pinned_extent(struct btrfs_fs_info *fs_info,
47324732
break;
47334733
}
47344734

4735-
clear_extent_dirty(unpin, start, end, &cached_state);
4735+
btrfs_clear_extent_dirty(unpin, start, end, &cached_state);
47364736
free_extent_state(cached_state);
47374737
btrfs_error_unpin_extent_range(fs_info, start, end);
47384738
mutex_unlock(&fs_info->unused_bg_unpin_mutex);

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,9 @@ static void set_gfp_mask_from_bits(u32 *bits, gfp_t *mask)
597597
*
598598
* This takes the tree lock, and returns 0 on success and < 0 on error.
599599
*/
600-
int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
601-
u32 bits, struct extent_state **cached_state,
602-
struct extent_changeset *changeset)
600+
int btrfs_clear_extent_bit_changeset(struct extent_io_tree *tree, u64 start, u64 end,
601+
u32 bits, struct extent_state **cached_state,
602+
struct extent_changeset *changeset)
603603
{
604604
struct extent_state *state;
605605
struct extent_state *cached;
@@ -1828,7 +1828,7 @@ int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
18281828
*/
18291829
ASSERT(!(bits & EXTENT_LOCK_BITS));
18301830

1831-
return __clear_extent_bit(tree, start, end, bits, NULL, changeset);
1831+
return btrfs_clear_extent_bit_changeset(tree, start, end, bits, NULL, changeset);
18321832
}
18331833

18341834
bool btrfs_try_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
@@ -1841,7 +1841,8 @@ bool btrfs_try_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
18411841
NULL, cached, NULL);
18421842
if (err == -EEXIST) {
18431843
if (failed_start > start)
1844-
clear_extent_bit(tree, start, failed_start - 1, bits, cached);
1844+
btrfs_clear_extent_bit(tree, start, failed_start - 1,
1845+
bits, cached);
18451846
return 0;
18461847
}
18471848
return 1;
@@ -1862,8 +1863,8 @@ int btrfs_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, u32
18621863
&failed_state, cached_state, NULL);
18631864
while (err == -EEXIST) {
18641865
if (failed_start != start)
1865-
clear_extent_bit(tree, start, failed_start - 1,
1866-
bits, cached_state);
1866+
btrfs_clear_extent_bit(tree, start, failed_start - 1,
1867+
bits, cached_state);
18671868

18681869
wait_extent_bit(tree, failed_start, end, bits, &failed_state);
18691870
err = __set_extent_bit(tree, start, end, bits,

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,40 +173,41 @@ void get_range_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 *bits,
173173
struct extent_state **cached_state);
174174
int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
175175
u32 bits, struct extent_changeset *changeset);
176-
int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
177-
u32 bits, struct extent_state **cached,
178-
struct extent_changeset *changeset);
176+
int btrfs_clear_extent_bit_changeset(struct extent_io_tree *tree, u64 start, u64 end,
177+
u32 bits, struct extent_state **cached,
178+
struct extent_changeset *changeset);
179179

180-
static inline int clear_extent_bit(struct extent_io_tree *tree, u64 start,
181-
u64 end, u32 bits,
182-
struct extent_state **cached)
180+
static inline int btrfs_clear_extent_bit(struct extent_io_tree *tree, u64 start,
181+
u64 end, u32 bits,
182+
struct extent_state **cached)
183183
{
184-
return __clear_extent_bit(tree, start, end, bits, cached, NULL);
184+
return btrfs_clear_extent_bit_changeset(tree, start, end, bits, cached, NULL);
185185
}
186186

187187
static inline int btrfs_unlock_extent(struct extent_io_tree *tree, u64 start, u64 end,
188188
struct extent_state **cached)
189189
{
190-
return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, cached, NULL);
190+
return btrfs_clear_extent_bit_changeset(tree, start, end, EXTENT_LOCKED,
191+
cached, NULL);
191192
}
192193

193-
static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,
194-
u64 end, u32 bits)
194+
static inline int btrfs_clear_extent_bits(struct extent_io_tree *tree, u64 start,
195+
u64 end, u32 bits)
195196
{
196-
return clear_extent_bit(tree, start, end, bits, NULL);
197+
return btrfs_clear_extent_bit(tree, start, end, bits, NULL);
197198
}
198199

199200
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
200201
u32 bits, struct extent_changeset *changeset);
201202
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
202203
u32 bits, struct extent_state **cached_state);
203204

204-
static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
205-
u64 end, struct extent_state **cached)
205+
static inline int btrfs_clear_extent_dirty(struct extent_io_tree *tree, u64 start,
206+
u64 end, struct extent_state **cached)
206207
{
207-
return clear_extent_bit(tree, start, end,
208-
EXTENT_DIRTY | EXTENT_DELALLOC |
209-
EXTENT_DO_ACCOUNTING, cached);
208+
return btrfs_clear_extent_bit(tree, start, end,
209+
EXTENT_DIRTY | EXTENT_DELALLOC |
210+
EXTENT_DO_ACCOUNTING, cached);
210211
}
211212

212213
int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
@@ -238,7 +239,8 @@ static inline bool btrfs_try_lock_dio_extent(struct extent_io_tree *tree, u64 st
238239
static inline int btrfs_unlock_dio_extent(struct extent_io_tree *tree, u64 start,
239240
u64 end, struct extent_state **cached)
240241
{
241-
return __clear_extent_bit(tree, start, end, EXTENT_DIO_LOCKED, cached, NULL);
242+
return btrfs_clear_extent_bit_changeset(tree, start, end, EXTENT_DIO_LOCKED,
243+
cached, NULL);
242244
}
243245

244246
#endif /* BTRFS_EXTENT_IO_TREE_H */

‎fs/btrfs/extent-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2839,7 +2839,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
28392839
ret = btrfs_discard_extent(fs_info, start,
28402840
end + 1 - start, NULL);
28412841

2842-
clear_extent_dirty(unpin, start, end, &cached_state);
2842+
btrfs_clear_extent_dirty(unpin, start, end, &cached_state);
28432843
ret = unpin_extent_range(fs_info, start, end, true);
28442844
BUG_ON(ret);
28452845
mutex_unlock(&fs_info->unused_bg_unpin_mutex);

‎fs/btrfs/extent_io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
393393
struct extent_state **cached,
394394
u32 clear_bits, unsigned long page_ops)
395395
{
396-
clear_extent_bit(&inode->io_tree, start, end, clear_bits, cached);
396+
btrfs_clear_extent_bit(&inode->io_tree, start, end, clear_bits, cached);
397397

398398
__process_folios_contig(inode->vfs_inode.i_mapping, locked_folio, start,
399399
end, page_ops);
@@ -2634,7 +2634,7 @@ static bool try_release_extent_state(struct extent_io_tree *tree,
26342634
* nodatasum, delalloc new and finishing ordered bits. The delalloc new
26352635
* bit will be cleared by ordered extent completion.
26362636
*/
2637-
ret2 = clear_extent_bit(tree, start, end, clear_bits, &cached_state);
2637+
ret2 = btrfs_clear_extent_bit(tree, start, end, clear_bits, &cached_state);
26382638
/*
26392639
* If clear_extent_bit failed for enomem reasons, we can't allow the
26402640
* release to continue.

‎fs/btrfs/file-item.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ int btrfs_inode_clear_file_extent_range(struct btrfs_inode *inode, u64 start,
121121
ASSERT(IS_ALIGNED(start + len, inode->root->fs_info->sectorsize) ||
122122
len == (u64)-1);
123123

124-
return clear_extent_bit(inode->file_extent_tree, start,
125-
start + len - 1, EXTENT_DIRTY, NULL);
124+
return btrfs_clear_extent_bit(inode->file_extent_tree, start,
125+
start + len - 1, EXTENT_DIRTY, NULL);
126126
}
127127

128128
static size_t bytes_to_csum_size(const struct btrfs_fs_info *fs_info, u32 bytes)

‎fs/btrfs/file.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ int btrfs_dirty_folio(struct btrfs_inode *inode, struct folio *folio, loff_t pos
9898
* The pages may have already been dirty, clear out old accounting so
9999
* we can set things up properly
100100
*/
101-
clear_extent_bit(&inode->io_tree, start_pos, end_of_last_block,
102-
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
103-
cached);
101+
btrfs_clear_extent_bit(&inode->io_tree, start_pos, end_of_last_block,
102+
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
103+
cached);
104104

105105
ret = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block,
106106
extra_bits, cached);
@@ -1937,9 +1937,9 @@ static vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)
19371937
* clear any delalloc bits within this page range since we have to
19381938
* reserve data&meta space before lock_page() (see above comments).
19391939
*/
1940-
clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start, end,
1941-
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |
1942-
EXTENT_DEFRAG, &cached_state);
1940+
btrfs_clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start, end,
1941+
EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |
1942+
EXTENT_DEFRAG, &cached_state);
19431943

19441944
ret2 = btrfs_set_extent_delalloc(BTRFS_I(inode), page_start, end, 0,
19451945
&cached_state);

0 commit comments

Comments
 (0)