diff options
| author | Filipe Manana <fdmanana@suse.com> | 2025-04-08 16:52:09 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2025-05-15 14:30:45 +0200 |
| commit | 2e871330cea44f7459726b0d83252949ae76166f (patch) | |
| tree | 6da1841f98ed6254c2c86a1f7befabf8d3964fb3 /fs/btrfs/inode.c | |
| parent | 962162ffa64f311a8c0cfbf1acfe7a8da126d4b0 (diff) | |
btrfs: rename extent map functions to get block start, end and check if in tree
These functions are exported and don't have a 'btrfs_' prefix in their
names, which goes against coding style conventions. Rename them to have
such prefix, making it clear they are from btrfs and avoiding potential
collisions in the future with functions defined elsewhere outside btrfs.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index faa8f66ee662..9b4f70102d97 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1221,11 +1221,11 @@ u64 btrfs_get_extent_allocation_hint(struct btrfs_inode *inode, u64 start, free_extent_map(em); em = search_extent_mapping(em_tree, 0, 0); if (em && em->disk_bytenr < EXTENT_MAP_LAST_BYTE) - alloc_hint = extent_map_block_start(em); + alloc_hint = btrfs_extent_map_block_start(em); if (em) free_extent_map(em); } else { - alloc_hint = extent_map_block_start(em); + alloc_hint = btrfs_extent_map_block_start(em); free_extent_map(em); } } @@ -2686,7 +2686,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode, search_start + em_len - 1, EXTENT_DELALLOC_NEW, cached_state); next: - search_start = extent_map_end(em); + search_start = btrfs_extent_map_end(em); free_extent_map(em); if (ret) return ret; @@ -5013,7 +5013,7 @@ int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size) em = NULL; break; } - last_byte = min(extent_map_end(em), block_end); + last_byte = min(btrfs_extent_map_end(em), block_end); last_byte = ALIGN(last_byte, fs_info->sectorsize); hole_size = last_byte - cur_offset; @@ -7025,7 +7025,7 @@ not_found: insert: ret = 0; btrfs_release_path(path); - if (em->start > start || extent_map_end(em) <= start) { + if (em->start > start || btrfs_extent_map_end(em) <= start) { btrfs_err(fs_info, "bad extent! em: [%llu %llu] passed [%llu %llu]", em->start, em->len, start, len); @@ -9424,7 +9424,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, * We only want to return up to EOF even if the extent extends beyond * that. */ - encoded->len = min_t(u64, extent_map_end(em), + encoded->len = min_t(u64, btrfs_extent_map_end(em), inode->vfs_inode.i_size) - iocb->ki_pos; if (em->disk_bytenr == EXTENT_MAP_HOLE || (em->flags & EXTENT_FLAG_PREALLOC)) { @@ -9452,7 +9452,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, goto out_em; encoded->compression = ret; } else { - *disk_bytenr = extent_map_block_start(em) + (start - em->start); + *disk_bytenr = btrfs_extent_map_block_start(em) + (start - em->start); if (encoded->len > count) encoded->len = count; /* |