btrfs: rename exported functions from extent_map.h
cover btrfs: rename exported functions from extent_map.h
From: Filipe Manana <[email protected]>
Many of the exported functions from extent_map.h don't have a 'btrfs_' prefix, but some have, making it inconsistent and also against the coding style conventions. I've added myself some of them recently, to get and set compression on an extent map, and ended up not adding the prefix since the other functions in the file didn't have the prefix, just to make things consistent. So rename the ones without the prefix to have it.
I've split this into more reasonably sized patches to avoid having a huge patch and make things easier to review.
Filipe Manana (6):
btrfs: rename exported extent map compression functions
btrfs: rename extent map functions to get block start, end and check if in tree
btrfs: rename functions to allocate and free extent maps
btrfs: rename remaining exported extent map functions
btrfs: rename __lookup_extent_mapping() to remove double underscore prefix
btrfs: rename __tree_search() to remove double underscore prefix
fs/btrfs/compression.c | 18 ++-- fs/btrfs/defrag.c | 22 ++-- fs/btrfs/direct-io.c | 26 ++--- fs/btrfs/disk-io.c | 2 +- fs/btrfs/extent_io.c | 45 +++++---- fs/btrfs/extent_map.c | 163 +++++++++++++++--------------- fs/btrfs/extent_map.h | 47 ++++----- fs/btrfs/file-item.c | 4 +- fs/btrfs/file.c | 30 +++--- fs/btrfs/inode.c | 80 +++++++-------- fs/btrfs/relocation.c | 4 +- fs/btrfs/super.c | 4 +- fs/btrfs/tests/extent-map-tests.c | 102 +++++++++---------- fs/btrfs/tests/inode-tests.c | 79 ++++++++------- fs/btrfs/tree-log.c | 16 +-- fs/btrfs/zoned.c | 10 +- 16 files changed, 327 insertions(+), 325 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/6 btrfs: rename exported extent map compression functions
From: Filipe Manana <[email protected]>
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 pontential collisions in the future with functions defined elsewhere outside btrfs.
--- fs/btrfs/compression.c | 4 ++-- fs/btrfs/defrag.c | 2 +- fs/btrfs/direct-io.c | 2 +- fs/btrfs/extent_io.c | 4 ++-- fs/btrfs/extent_map.c | 14 +++++++------- fs/btrfs/extent_map.h | 11 ++++++----- fs/btrfs/file-item.c | 4 ++-- fs/btrfs/inode.c | 6 +++--- fs/btrfs/tests/inode-tests.c | 12 ++++++------ fs/btrfs/tree-log.c | 4 ++-- 10 files changed, 32 insertions(+), 31 deletions(-)
fs/btrfs/compression.c +2 -2
@@ -588,7 +588,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio) goto out; } -ASSERT (extent_map_is_compressed (em)); +ASSERT (btrfs_extent_map_is_compressed (em)); compressed_len = em->disk_num_bytes; cb = alloc_compressed_bio(inode, file_offset, REQ_OP_READ,
@@ -600,7 +600,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio) cb->len = bbio->bio.bi_iter.bi_size; cb->compressed_len = compressed_len; - cb->compress_type =extent_map_compression (em); + cb->compress_type =btrfs_extent_map_compression (em); cb->orig_bbio = bbio;free_extent_map (em);
fs/btrfs/defrag.c +1 -1
@@ -791,7 +791,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start,static u32 get_extent_max_capacity (const struct btrfs_fs_info *fs_info,const struct extent_map *em) { -if (extent_map_is_compressed (em)) +if (btrfs_extent_map_is_compressed (em))return BTRFS_MAX_COMPRESSED ;return fs_info->max_extent_size; }
fs/btrfs/direct-io.c +1 -1
@@ -474,7 +474,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,* to buffered IO. Don't blame me, this is the price we pay for using * the generic code. */ -if (extent_map_is_compressed (em) || em->disk_bytenr ==EXTENT_MAP_INLINE ) { +if (btrfs_extent_map_is_compressed (em) || em->disk_bytenr ==EXTENT_MAP_INLINE ) {free_extent_map (em);/* * If we are in a NOWAIT context, return -EAGAIN in order to
fs/btrfs/extent_io.c +2 -2
@@ -970,7 +970,7 @@ static int btrfs_do_readpage(struct folio *folio, struct extent_map **em_cached,BUG_ON (extent_map_end (em) <= cur);BUG_ON (end < cur); - compress_type =extent_map_compression (em); + compress_type =btrfs_extent_map_compression (em);if (compress_type !=BTRFS_COMPRESS_NONE ) disk_bytenr = em->disk_bytenr;
@@ -1545,7 +1545,7 @@ static int submit_one_sector(struct btrfs_inode *inode, block_start =extent_map_block_start (em); disk_bytenr =extent_map_block_start (em) + extent_offset; -ASSERT (!extent_map_is_compressed (em)); +ASSERT (!btrfs_extent_map_is_compressed (em));ASSERT (block_start !=EXTENT_MAP_HOLE );ASSERT (block_start !=EXTENT_MAP_INLINE );
fs/btrfs/extent_map.c +7 -7
@@ -188,7 +188,7 @@ static struct rb_node *__tree_search(struct rb_root *root, u64 offset,static inline u64 extent_map_block_len (const struct extent_map *em) { -if (extent_map_is_compressed (em)) +if (btrfs_extent_map_is_compressed (em))return em->disk_num_bytes;return em->len; }
@@ -210,7 +210,7 @@ static bool can_merge_extent_map(const struct extent_map *em)return false;/* Don't merge compressed extents, we need to know their actual size. */ -if (extent_map_is_compressed (em)) +if (btrfs_extent_map_is_compressed (em))return false;if (em->flags &EXTENT_FLAG_LOGGING )
@@ -270,8 +270,8 @@ static void merge_ondisk_extents(const struct extent_map *prev, const struct extu64 new_offset;/* @prev and @next should not be compressed. */ -ASSERT (!extent_map_is_compressed (prev)); -ASSERT (!extent_map_is_compressed (next)); +ASSERT (!btrfs_extent_map_is_compressed (prev)); +ASSERT (!btrfs_extent_map_is_compressed (next));/* * There are two different cases where @prev and @next can be merged.
@@ -327,9 +327,9 @@ static void validate_extent_map(struct btrfs_fs_info *fs_info, struct extent_mapif (em->offset + em->len > em->ram_bytes)dump_extent_map (fs_info,"ram_bytes too small" , em);if (em->offset + em->len > em->disk_num_bytes && - !extent_map_is_compressed (em)) + !btrfs_extent_map_is_compressed (em))dump_extent_map (fs_info,"disk_num_bytes too small" , em); -if (!extent_map_is_compressed (em) && +if (!btrfs_extent_map_is_compressed (em) && em->ram_bytes != em->disk_num_bytes) dump_extent_map(fs_info, "ram_bytes mismatch with disk_num_bytes for non-compressed em",
@@ -1064,7 +1064,7 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre, }ASSERT (em->len == len); -ASSERT (!extent_map_is_compressed (em)); +ASSERT (!btrfs_extent_map_is_compressed (em));ASSERT (em->disk_bytenr <EXTENT_MAP_LAST_BYTE );ASSERT (em->flags &EXTENT_FLAG_PINNED );ASSERT (!(em->flags &EXTENT_FLAG_LOGGING ));
fs/btrfs/extent_map.h +6 -5
@@ -108,8 +108,8 @@ struct extent_map_tree {struct btrfs_inode ; -static inline void extent_map_set_compression (struct extent_map *em, -enum btrfs_compression_type type) +static inline void btrfs_extent_map_set_compression (struct extent_map *em, +enum btrfs_compression_type type) {if (type ==BTRFS_COMPRESS_ZLIB ) em->flags |=EXTENT_FLAG_COMPRESS_ZLIB ;
@@ -119,7 +119,8 @@ static inline void extent_map_set_compression(struct extent_map *em, em->flags |=EXTENT_FLAG_COMPRESS_ZSTD ; } -static inline enum btrfs_compression_type extent_map_compression (const struct extent_map *em) +static inline enum btrfs_compression_type btrfs_extent_map_compression ( +const struct extent_map *em) {if (em->flags &EXTENT_FLAG_COMPRESS_ZLIB )return BTRFS_COMPRESS_ZLIB ;
@@ -137,7 +138,7 @@ static inline enum btrfs_compression_type extent_map_compression(const struct ex* More efficient way to determine if extent is compressed, instead of using * 'extent_map_compression() != BTRFS_COMPRESS_NONE'. */ -static inline bool extent_map_is_compressed (const struct extent_map *em) +static inline bool btrfs_extent_map_is_compressed (const struct extent_map *em) { return (em->flags & (EXTENT_FLAG_COMPRESS_ZLIB | EXTENT_FLAG_COMPRESS_LZO |
@@ -152,7 +153,7 @@ static inline int extent_map_in_tree(const struct extent_map *em)static inline u64 extent_map_block_start (const struct extent_map *em) {if (em->disk_bytenr <EXTENT_MAP_LAST_BYTE ) { -if (extent_map_is_compressed (em)) +if (btrfs_extent_map_is_compressed (em))return em->disk_bytenr;return em->disk_bytenr + em->offset; }
fs/btrfs/file-item.c +2 -2
@@ -1296,7 +1296,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, em->disk_num_bytes =btrfs_file_extent_disk_num_bytes (leaf, fi); em->offset =btrfs_file_extent_offset (leaf, fi);if (compress_type !=BTRFS_COMPRESS_NONE ) { -extent_map_set_compression (em, compress_type); +btrfs_extent_map_set_compression (em, compress_type); }else {/* * Older kernels can create regular non-hole data
@@ -1316,7 +1316,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, em->start =0 ; em->len = fs_info->sectorsize; em->offset =0 ; -extent_map_set_compression (em, compress_type); +btrfs_extent_map_set_compression (em, compress_type); }else {btrfs_err (fs_info, "unknown file extent item type %d, inode %llu, offset %llu, "
fs/btrfs/inode.c +3 -3
@@ -7217,7 +7217,7 @@ struct extent_map *btrfs_create_io_em(struct btrfs_inode *inode, u64 start, em->offset = file_extent->offset; em->flags |=EXTENT_FLAG_PINNED ;if (type ==BTRFS_ORDERED_COMPRESSED ) -extent_map_set_compression (em, file_extent->compression); +btrfs_extent_map_set_compression (em, file_extent->compression); ret =btrfs_replace_extent_map_range (inode, em, true);if (ret) {
@@ -9422,7 +9422,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, count =min_t (u64, count, encoded->len); encoded->len = count; encoded->unencoded_len = count; - }else if (extent_map_is_compressed (em)) { + }else if (btrfs_extent_map_is_compressed (em)) { *disk_bytenr = em->disk_bytenr;/* * Bail if the buffer isn't large enough to return the whole
@@ -9437,7 +9437,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, encoded->unencoded_len = em->ram_bytes; encoded->unencoded_offset = iocb->ki_pos - (em->start - em->offset); ret =btrfs_encoded_io_compression_from_extent (fs_info, -extent_map_compression (em)); +btrfs_extent_map_compression (em));if (ret <0 ) goto out_em; encoded->compression = ret;
fs/btrfs/tests/inode-tests.c +6 -6
@@ -597,9 +597,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)test_err ("wrong offset, want 0, have %llu" , em->offset); goto out; } -if (extent_map_compression (em) !=BTRFS_COMPRESS_ZLIB ) { +if (btrfs_extent_map_compression (em) !=BTRFS_COMPRESS_ZLIB ) {test_err ("unexpected compress type, wanted %d, got %d" , -BTRFS_COMPRESS_ZLIB ,extent_map_compression (em)); +BTRFS_COMPRESS_ZLIB ,btrfs_extent_map_compression (em)); goto out; } offset = em->start + em->len;
@@ -630,9 +630,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)test_err ("wrong offset, want 0, have %llu" , em->offset); goto out; } -if (extent_map_compression (em) !=BTRFS_COMPRESS_ZLIB ) { +if (btrfs_extent_map_compression (em) !=BTRFS_COMPRESS_ZLIB ) {test_err ("unexpected compress type, wanted %d, got %d" , -BTRFS_COMPRESS_ZLIB ,extent_map_compression (em)); +BTRFS_COMPRESS_ZLIB ,btrfs_extent_map_compression (em)); goto out; } disk_bytenr =extent_map_block_start (em);
@@ -692,9 +692,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) em->start, em->offset, orig_start); goto out; } -if (extent_map_compression (em) !=BTRFS_COMPRESS_ZLIB ) { +if (btrfs_extent_map_compression (em) !=BTRFS_COMPRESS_ZLIB ) {test_err ("unexpected compress type, wanted %d, got %d" , -BTRFS_COMPRESS_ZLIB ,extent_map_compression (em)); +BTRFS_COMPRESS_ZLIB ,btrfs_extent_map_compression (em)); goto out; } offset = em->start + em->len;
fs/btrfs/tree-log.c +2 -2
@@ -4648,7 +4648,7 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,return 0 ;/* If we're compressed we have to save the entire range of csums. */ -if (extent_map_is_compressed (em)) { +if (btrfs_extent_map_is_compressed (em)) { csum_offset =0 ; csum_len = em->disk_num_bytes; }else {
@@ -4703,7 +4703,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,btrfs_set_stack_file_extent_type (&fi,BTRFS_FILE_EXTENT_REG ); block_len = em->disk_num_bytes; - compress_type =extent_map_compression (em); + compress_type =btrfs_extent_map_compression (em);if (compress_type !=BTRFS_COMPRESS_NONE ) {btrfs_set_stack_file_extent_disk_bytenr (&fi, block_start);btrfs_set_stack_file_extent_disk_num_bytes (&fi, block_len);
Signature · 1 line
2.45.2
PATCH 2/6 btrfs: rename extent map functions to get block start, end and check if in tree
In reply to [email protected]From: Filipe Manana <[email protected]>
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 pontential collisions in the future with functions defined elsewhere outside btrfs.
--- fs/btrfs/compression.c | 4 +-- fs/btrfs/defrag.c | 4 +-- fs/btrfs/direct-io.c | 4 +-- fs/btrfs/extent_io.c | 21 +++++++------- fs/btrfs/extent_map.c | 48 +++++++++++++++---------------- fs/btrfs/extent_map.h | 6 ++-- fs/btrfs/file.c | 6 ++-- fs/btrfs/inode.c | 14 ++++----- fs/btrfs/tests/extent-map-tests.c | 14 ++++----- fs/btrfs/tests/inode-tests.c | 27 ++++++++--------- fs/btrfs/tree-log.c | 4 +-- 11 files changed, 77 insertions(+), 75 deletions(-)
fs/btrfs/compression.c +2 -2
@@ -510,8 +510,8 @@ static noinline int add_ra_bio_pages(struct inode *inode,* to this compressed extent on disk. */ if (!em || cur < em->start || - (cur + fs_info->sectorsize >extent_map_end (em)) || - (extent_map_block_start (em) >>SECTOR_SHIFT ) != + (cur + fs_info->sectorsize >btrfs_extent_map_end (em)) || + (btrfs_extent_map_block_start (em) >>SECTOR_SHIFT ) != orig_bio->bi_iter.bi_sector) {free_extent_map (em);btrfs_unlock_extent (tree, cur, page_end,NULL );
fs/btrfs/defrag.c +2 -2
@@ -1074,7 +1074,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode, add: last_is_target = true; - range_len =min (extent_map_end (em), start + len) - cur; + range_len =min (btrfs_extent_map_end (em), start + len) - cur;/* * This one is a good target, check if it can be merged into * last range of the target list.
@@ -1105,7 +1105,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode,list_add_tail (&new->list, target_list); next: - cur =extent_map_end (em); + cur =btrfs_extent_map_end (em);free_extent_map (em); }if (ret <0 ) {
fs/btrfs/direct-io.c +2 -2
@@ -246,7 +246,7 @@ static int btrfs_get_blocks_direct_write(struct extent_map **map,else type =BTRFS_ORDERED_NOCOW ; len =min (len, em->len - (start - em->start)); - block_start =extent_map_block_start (em) + (start - em->start); + block_start =btrfs_extent_map_block_start (em) + (start - em->start);if (can_nocow_extent (BTRFS_I (inode), start, &len, &file_extent, false) ==1 ) {
@@ -558,7 +558,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start, iomap->addr =IOMAP_NULL_ADDR ; iomap->type =IOMAP_HOLE ; }else { - iomap->addr =extent_map_block_start (em) + (start - em->start); + iomap->addr =btrfs_extent_map_block_start (em) + (start - em->start); iomap->type =IOMAP_MAPPED ; } iomap->offset = start;
fs/btrfs/extent_io.c +11 -10
@@ -890,8 +890,8 @@ static struct extent_map *get_extent_map(struct btrfs_inode *inode,if (*em_cached) { em = *em_cached; -if (extent_map_in_tree (em) && start >= em->start && - start <extent_map_end (em)) { +if (btrfs_extent_map_in_tree (em) && start >= em->start && + start <btrfs_extent_map_end (em)) {refcount_inc (&em->refs);return em; }
@@ -967,7 +967,7 @@ static int btrfs_do_readpage(struct folio *folio, struct extent_map **em_cached,return PTR_ERR (em); } extent_offset = cur - em->start; -BUG_ON (extent_map_end (em) <= cur); +BUG_ON (btrfs_extent_map_end (em) <= cur);BUG_ON (end < cur); compress_type =btrfs_extent_map_compression (em);
@@ -975,12 +975,12 @@ static int btrfs_do_readpage(struct folio *folio, struct extent_map **em_cached,if (compress_type !=BTRFS_COMPRESS_NONE ) disk_bytenr = em->disk_bytenr;else - disk_bytenr =extent_map_block_start (em) + extent_offset; + disk_bytenr =btrfs_extent_map_block_start (em) + extent_offset;if (em->flags &EXTENT_FLAG_PREALLOC ) block_start =EXTENT_MAP_HOLE ;else - block_start =extent_map_block_start (em); + block_start =btrfs_extent_map_block_start (em);/* * If we have a file range that points to a compressed extent
@@ -1537,13 +1537,13 @@ static int submit_one_sector(struct btrfs_inode *inode,return PTR_ERR (em); extent_offset = filepos - em->start; - em_end =extent_map_end (em); + em_end =btrfs_extent_map_end (em);ASSERT (filepos <= em_end);ASSERT (IS_ALIGNED (em->start, sectorsize));ASSERT (IS_ALIGNED (em->len, sectorsize)); - block_start =extent_map_block_start (em); - disk_bytenr =extent_map_block_start (em) + extent_offset; + block_start =btrfs_extent_map_block_start (em); + disk_bytenr =btrfs_extent_map_block_start (em) + extent_offset;ASSERT (!btrfs_extent_map_is_compressed (em));ASSERT (block_start !=EXTENT_MAP_HOLE );
@@ -2677,7 +2677,8 @@ bool try_release_extent_mapping(struct folio *folio, gfp_t mask)break ; }if (btrfs_test_range_bit_exists (io_tree, em->start, -extent_map_end (em) -1 ,EXTENT_LOCKED )) +btrfs_extent_map_end (em) -1 , +EXTENT_LOCKED )) goto next;/* * If it's not in the list of modified extents, used by a fast
@@ -2708,7 +2709,7 @@ bool try_release_extent_mapping(struct folio *folio, gfp_t mask)/* Once for the inode's extent map tree. */ free_extent_map (em); next: - start =extent_map_end (em); + start =btrfs_extent_map_end (em);write_unlock (&extent_tree->lock);/* Once for us, for the lookup_extent_mapping() reference. */
fs/btrfs/extent_map.c +24 -24
179 lines not on this page · raw message
fs/btrfs/extent_map.h +3 -3
@@ -145,12 +145,12 @@ static inline bool btrfs_extent_map_is_compressed(const struct extent_map *em) EXTENT_FLAG_COMPRESS_ZSTD)) != 0; } -static inline int extent_map_in_tree (const struct extent_map *em) +static inline int btrfs_extent_map_in_tree (const struct extent_map *em) {return !RB_EMPTY_NODE (&em->rb_node); } -static inline u64 extent_map_block_start (const struct extent_map *em) +static inline u64 btrfs_extent_map_block_start (const struct extent_map *em) {if (em->disk_bytenr <EXTENT_MAP_LAST_BYTE ) {if (btrfs_extent_map_is_compressed (em))
@@ -160,7 +160,7 @@ static inline u64 extent_map_block_start(const struct extent_map *em)return em->disk_bytenr; } -static inline u64 extent_map_end (const struct extent_map *em) +static inline u64 btrfs_extent_map_end (const struct extent_map *em) {if (em->start + em->len < em->start)return (u64)-1 ;
fs/btrfs/file.c +3 -3
@@ -2915,7 +2915,7 @@ static int btrfs_zero_range(struct inode *inode,ASSERT (IS_ALIGNED (alloc_start, sectorsize)); len = offset + len - alloc_start; offset = alloc_start; - alloc_hint =extent_map_block_start (em) + em->len; + alloc_hint =btrfs_extent_map_block_start (em) + em->len; }free_extent_map (em);
@@ -3143,8 +3143,8 @@ static long btrfs_fallocate(struct file *file, int mode, ret =PTR_ERR (em);break ; } - last_byte =min (extent_map_end (em), alloc_end); - actual_end =min_t (u64,extent_map_end (em), offset + len); + last_byte =min (btrfs_extent_map_end (em), alloc_end); + actual_end =min_t (u64,btrfs_extent_map_end (em), offset + len); last_byte =ALIGN (last_byte, blocksize); if (em->disk_bytenr == EXTENT_MAP_HOLE || (cur_offset >= inode->i_size &&
fs/btrfs/inode.c +7 -7
@@ -1214,11 +1214,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); } }
@@ -2678,7 +2678,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;
@@ -5005,7 +5005,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;
@@ -7015,7 +7015,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, 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);
@@ -9414,7 +9414,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 )) {
@@ -9442,7 +9442,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;/*
fs/btrfs/tests/extent-map-tests.c +7 -7
@@ -137,7 +137,7 @@ static int test_case_1(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode) ret = -ENOENT ; goto out; } -if (em->start !=0 ||extent_map_end (em) !=SZ_16K || +if (em->start !=0 ||btrfs_extent_map_end (em) !=SZ_16K || em->disk_bytenr !=0 || em->disk_num_bytes !=SZ_16K ) { test_err( "case1 [%llu %llu]: ret %d return a wrong em (start %llu len %llu disk_bytenr %llu disk_num_bytes %llu",
@@ -235,7 +235,7 @@ static int test_case_2(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode) ret = -ENOENT ; goto out; } -if (em->start !=0 ||extent_map_end (em) !=SZ_1K || +if (em->start !=0 ||btrfs_extent_map_end (em) !=SZ_1K || em->disk_bytenr !=EXTENT_MAP_INLINE ) { test_err( "case2 [0 1K]: ret %d return a wrong em (start %llu len %llu disk_bytenr %llu",
@@ -312,8 +312,8 @@ static int __test_case_3(struct btrfs_fs_info *fs_info,* Since bytes within em are contiguous, em->block_start is identical to * em->start. */ -if (start < em->start || start + len >extent_map_end (em) || - em->start !=extent_map_block_start (em)) { +if (start < em->start || start + len >btrfs_extent_map_end (em) || + em->start !=btrfs_extent_map_block_start (em)) { test_err( "case3 [%llu %llu): ret %d em (start %llu len %llu disk_bytenr %llu block_len %llu)", start, start + len, ret, em->start, em->len,
@@ -438,7 +438,7 @@ static int __test_case_4(struct btrfs_fs_info *fs_info, ret = -ENOENT ; goto out; } -if (start < em->start || start + len >extent_map_end (em)) { +if (start < em->start || start + len >btrfs_extent_map_end (em)) { test_err( "case4 [%llu %llu): ret %d, added wrong em (start %llu len %llu disk_bytenr %llu disk_num_bytes %llu)", start, start + len, ret, em->start, em->len,
@@ -870,9 +870,9 @@ static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode) goto out; } -if (extent_map_block_start (em) !=SZ_32K +SZ_4K ) { +if (btrfs_extent_map_block_start (em) !=SZ_32K +SZ_4K ) {test_err ("em->block_start is %llu, expected 36K" , -extent_map_block_start (em)); +btrfs_extent_map_block_start (em)); goto out; }
fs/btrfs/tests/inode-tests.c +14 -13
@@ -389,7 +389,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)test_err ("wrong offset, want 0, have %llu" , em->offset); goto out; } - disk_bytenr =extent_map_block_start (em); + disk_bytenr =btrfs_extent_map_block_start (em); orig_start = em->start; offset = em->start + em->len;free_extent_map (em);
@@ -441,9 +441,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } disk_bytenr += (em->start - orig_start); -if (extent_map_block_start (em) != disk_bytenr) { +if (btrfs_extent_map_block_start (em) != disk_bytenr) {test_err ("wrong block start, want %llu, have %llu" , - disk_bytenr,extent_map_block_start (em)); + disk_bytenr,btrfs_extent_map_block_start (em)); goto out; } offset = em->start + em->len;
@@ -502,7 +502,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)test_err ("wrong offset, want 0, have %llu" , em->offset); goto out; } - disk_bytenr =extent_map_block_start (em); + disk_bytenr =btrfs_extent_map_block_start (em); orig_start = em->start; offset = em->start + em->len;free_extent_map (em);
@@ -531,9 +531,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) em->start - orig_start, em->offset); goto out; } -if (extent_map_block_start (em) != disk_bytenr + em->offset) { +if (btrfs_extent_map_block_start (em) != disk_bytenr + em->offset) {test_err ("unexpected block start, wanted %llu, have %llu" , - disk_bytenr + em->offset,extent_map_block_start (em)); + disk_bytenr + em->offset,btrfs_extent_map_block_start (em)); goto out; } offset = em->start + em->len;
@@ -564,9 +564,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) em->start, em->offset, orig_start); goto out; } -if (extent_map_block_start (em) != disk_bytenr + em->offset) { +if (btrfs_extent_map_block_start (em) != disk_bytenr + em->offset) {test_err ("unexpected block start, wanted %llu, have %llu" , - disk_bytenr + em->offset,extent_map_block_start (em)); + disk_bytenr + em->offset,btrfs_extent_map_block_start (em)); goto out; } offset = em->start + em->len;
@@ -635,7 +635,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) BTRFS_COMPRESS_ZLIB, btrfs_extent_map_compression(em)); goto out; } - disk_bytenr =extent_map_block_start (em); + disk_bytenr =btrfs_extent_map_block_start (em); orig_start = em->start; offset = em->start + em->len;free_extent_map (em);
@@ -671,9 +671,9 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)test_err ("got an error when we shouldn't have" ); goto out; } -if (extent_map_block_start (em) != disk_bytenr) { +if (btrfs_extent_map_block_start (em) != disk_bytenr) {test_err ("block start does not match, want %llu got %llu" , - disk_bytenr,extent_map_block_start (em)); + disk_bytenr,btrfs_extent_map_block_start (em)); goto out; }if (em->start != offset || em->len !=2 * sectorsize) {
@@ -865,8 +865,9 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)test_err ("got an error when we shouldn't have" ); goto out; } -if (extent_map_block_start (em) != sectorsize) { -test_err ("expected a real extent, got %llu" ,extent_map_block_start (em)); +if (btrfs_extent_map_block_start (em) != sectorsize) { +test_err ("expected a real extent, got %llu" , +btrfs_extent_map_block_start (em)); goto out; }if (em->start != sectorsize || em->len != sectorsize) {
fs/btrfs/tree-log.c +2 -2
@@ -4657,7 +4657,7 @@ static int log_extent_csums(struct btrfs_trans_handle *trans, }/* block start is already adjusted for the file extent offset. */ - block_start =extent_map_block_start (em); + block_start =btrfs_extent_map_block_start (em); csum_root =btrfs_csum_root (trans->fs_info, block_start); ret = btrfs_lookup_csums_list(csum_root, block_start + csum_offset, block_start + csum_offset + csum_len - 1,
@@ -4692,7 +4692,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,struct btrfs_key key;enum btrfs_compression_type compress_type;u64 extent_offset = em->offset; -u64 block_start =extent_map_block_start (em); +u64 block_start =btrfs_extent_map_block_start (em);u64 block_len;int ret;
Signature · 1 line
2.45.2
PATCH 3/6 btrfs: rename functions to allocate and free extent maps
In reply to [email protected]From: Filipe Manana <[email protected]>
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 pontential collisions in the future with functions defined elsewhere outside btrfs.
--- fs/btrfs/compression.c | 6 +-- fs/btrfs/defrag.c | 14 +++--- fs/btrfs/direct-io.c | 14 +++--- fs/btrfs/extent_io.c | 16 +++---- fs/btrfs/extent_map.c | 48 +++++++++---------- fs/btrfs/extent_map.h | 4 +- fs/btrfs/file.c | 24 +++++----- fs/btrfs/inode.c | 48 +++++++++---------- fs/btrfs/relocation.c | 4 +- fs/btrfs/tests/extent-map-tests.c | 76 +++++++++++++++---------------- fs/btrfs/tests/inode-tests.c | 40 ++++++++-------- fs/btrfs/tree-log.c | 4 +- fs/btrfs/zoned.c | 2 +- 13 files changed, 150 insertions(+), 150 deletions(-)
fs/btrfs/compression.c +3 -3
@@ -513,14 +513,14 @@ static noinline int add_ra_bio_pages(struct inode *inode, (cur + fs_info->sectorsize > btrfs_extent_map_end(em)) || (btrfs_extent_map_block_start(em) >> SECTOR_SHIFT) != orig_bio->bi_iter.bi_sector) { -free_extent_map (em); +btrfs_free_extent_map (em);btrfs_unlock_extent (tree, cur, page_end,NULL );folio_unlock (folio);folio_put (folio);break ; } add_size =min (em->start + em->len, page_end +1 ) - cur; -free_extent_map (em); +btrfs_free_extent_map (em);btrfs_unlock_extent (tree, cur, page_end,NULL );if (folio_contains (folio, end_index)) {
@@ -603,7 +603,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio) cb->compress_type =btrfs_extent_map_compression (em); cb->orig_bbio = bbio; -free_extent_map (em); +btrfs_free_extent_map (em); cb->nr_folios =DIV_ROUND_UP (compressed_len,PAGE_SIZE ); cb->compressed_folios =kcalloc (cb->nr_folios,sizeof (struct page *),GFP_NOFS );
fs/btrfs/defrag.c +7 -7
@@ -621,7 +621,7 @@ static struct extent_map *defrag_get_extent(struct btrfs_inode *inode,u64 ino =btrfs_ino (inode);int ret; - em =alloc_extent_map (); + em =btrfs_alloc_extent_map ();if (!em) { ret = -ENOMEM ; goto err;
@@ -731,12 +731,12 @@ static struct extent_map *defrag_get_extent(struct btrfs_inode *inode, not_found:btrfs_release_path (&path); -free_extent_map (em); +btrfs_free_extent_map (em);return NULL ; err:btrfs_release_path (&path); -free_extent_map (em); +btrfs_free_extent_map (em);return ERR_PTR (ret); }
@@ -766,7 +766,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start,* file extent items in the inode's subvolume tree). */ if (em && (em->flags &EXTENT_FLAG_MERGED )) { -free_extent_map (em); +btrfs_free_extent_map (em); em =NULL ; }
@@ -834,7 +834,7 @@ static bool defrag_check_next_extent(struct inode *inode, struct extent_map *em, ret = true; out: -free_extent_map (next); +btrfs_free_extent_map (next);return ret; }
@@ -1096,7 +1096,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode,/* Allocate new defrag_target_range */ new =kmalloc (sizeof (*new),GFP_NOFS );if (!new) { -free_extent_map (em); +btrfs_free_extent_map (em); ret = -ENOMEM ;break ; }
@@ -1106,7 +1106,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode, next: cur =btrfs_extent_map_end (em); -free_extent_map (em); +btrfs_free_extent_map (em); }if (ret <0 ) {struct defrag_target_range *entry;
fs/btrfs/direct-io.c +7 -7
@@ -155,7 +155,7 @@ static struct extent_map *btrfs_create_dio_extent(struct btrfs_inode *inode, (1 << BTRFS_ORDERED_DIRECT));if (IS_ERR (ordered)) {if (em) { -free_extent_map (em); +btrfs_free_extent_map (em);btrfs_drop_extent_map_range (inode, start, start + file_extent->num_bytes -1 , false); }
@@ -265,7 +265,7 @@ static int btrfs_get_blocks_direct_write(struct extent_map **map, nowait);if (ret <0 ) {/* Our caller expects us to free the input extent map. */ -free_extent_map (em); +btrfs_free_extent_map (em); *map =NULL ;btrfs_dec_nocow_writers (bg);if (nowait && (ret == -ENOSPC || ret == -EDQUOT ))
@@ -278,7 +278,7 @@ static int btrfs_get_blocks_direct_write(struct extent_map **map, &file_extent, type);btrfs_dec_nocow_writers (bg);if (type ==BTRFS_ORDERED_PREALLOC ) { -free_extent_map (em); +btrfs_free_extent_map (em); *map = em2; em = em2; }
@@ -291,7 +291,7 @@ static int btrfs_get_blocks_direct_write(struct extent_map **map, dio_data->nocow_done = true; }else {/* Our caller expects us to free the input extent map. */ -free_extent_map (em); +btrfs_free_extent_map (em); *map =NULL ;if (nowait) {
@@ -475,7 +475,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,* the generic code. */ if (btrfs_extent_map_is_compressed (em) || em->disk_bytenr ==EXTENT_MAP_INLINE ) { -free_extent_map (em); +btrfs_free_extent_map (em);/* * If we are in a NOWAIT context, return -EAGAIN in order to * fallback to buffered IO. This is not only because we can
@@ -516,7 +516,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,* after we have submitted bios for all the extents in the range. */ if ((flags &IOMAP_NOWAIT ) && len < length) { -free_extent_map (em); +btrfs_free_extent_map (em); ret = -EAGAIN ; goto unlock_err; }
@@ -564,7 +564,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start, iomap->offset = start; iomap->bdev = fs_info->fs_devices->latest_dev->bdev; iomap->length = len; -free_extent_map (em); +btrfs_free_extent_map (em);/* * Reads will hold the EXTENT_DIO_LOCKED bit until the io is completed,
fs/btrfs/extent_io.c +8 -8
@@ -896,7 +896,7 @@ static struct extent_map *get_extent_map(struct btrfs_inode *inode,return em; } -free_extent_map (em); +btrfs_free_extent_map (em); *em_cached =NULL ; }
@@ -1024,7 +1024,7 @@ static int btrfs_do_readpage(struct folio *folio, struct extent_map **em_cached,if (prev_em_start) *prev_em_start = em->start; -free_extent_map (em); +btrfs_free_extent_map (em); em =NULL ;/* we've found a hole, just zero and go on */
@@ -1244,7 +1244,7 @@ int btrfs_read_folio(struct file *file, struct folio *folio) ret =btrfs_do_readpage (folio, &em_cached, &bio_ctrl,NULL );btrfs_unlock_extent (&inode->io_tree, start, end, &cached_state); -free_extent_map (em_cached); +btrfs_free_extent_map (em_cached);/* * If btrfs_do_readpage() failed we will want to submit the assembled
@@ -1549,7 +1549,7 @@ static int submit_one_sector(struct btrfs_inode *inode,ASSERT (block_start !=EXTENT_MAP_HOLE );ASSERT (block_start !=EXTENT_MAP_INLINE ); -free_extent_map (em); +btrfs_free_extent_map (em); em =NULL ;/*
@@ -2564,7 +2564,7 @@ void btrfs_readahead(struct readahead_control *rac)btrfs_unlock_extent (&inode->io_tree, start, end, &cached_state);if (em_cached) -free_extent_map (em_cached); +btrfs_free_extent_map (em_cached);submit_one_bio (&bio_ctrl); }
@@ -2673,7 +2673,7 @@ bool try_release_extent_mapping(struct folio *folio, gfp_t mask) }if ((em->flags &EXTENT_FLAG_PINNED ) || em->start != start) {write_unlock (&extent_tree->lock); -free_extent_map (em); +btrfs_free_extent_map (em);break ; } if (btrfs_test_range_bit_exists(io_tree, em->start,
@@ -2707,13 +2707,13 @@ bool try_release_extent_mapping(struct folio *folio, gfp_t mask)*/ remove_extent_mapping (inode, em);/* Once for the inode's extent map tree. */ -free_extent_map (em); +btrfs_free_extent_map (em); next: start =btrfs_extent_map_end (em);write_unlock (&extent_tree->lock);/* Once for us, for the lookup_extent_mapping() reference. */ -free_extent_map (em); +btrfs_free_extent_map (em);if (need_resched ()) {/*
fs/btrfs/extent_map.c +24 -24
160 lines not on this page · raw message
fs/btrfs/extent_map.h +2 -2
@@ -174,8 +174,8 @@ void remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *em);int split_extent_map (struct btrfs_inode *inode,u64 start,u64 len,u64 pre,u64 new_logical); -struct extent_map *alloc_extent_map (void ); -void free_extent_map (struct extent_map *em); +struct extent_map *btrfs_alloc_extent_map (void ); +void btrfs_free_extent_map (struct extent_map *em);int __init extent_map_init (void );void __cold extent_map_exit (void );int unpin_extent_cache (struct btrfs_inode *inode,u64 start,u64 len,u64 gen);
fs/btrfs/file.c +12 -12
@@ -2104,7 +2104,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, out:btrfs_release_path (path); - hole_em =alloc_extent_map (); + hole_em =btrfs_alloc_extent_map ();if (!hole_em) {btrfs_drop_extent_map_range (inode, offset, end -1 , false);btrfs_set_inode_full_sync (inode);
@@ -2118,7 +2118,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, hole_em->generation = trans->transid; ret =btrfs_replace_extent_map_range (inode, hole_em, true); -free_extent_map (hole_em); +btrfs_free_extent_map (hole_em);if (ret)btrfs_set_inode_full_sync (inode); }
@@ -2151,7 +2151,7 @@ static int find_first_non_hole(struct btrfs_inode *inode, u64 *start, u64 *len) 0 : *start + *len - em->start - em->len; *start = em->start + em->len; } -free_extent_map (em); +btrfs_free_extent_map (em);return ret; }
@@ -2858,7 +2858,7 @@ static int btrfs_zero_range_check_range_boundary(struct btrfs_inode *inode,else ret =RANGE_BOUNDARY_WRITTEN_EXTENT ; -free_extent_map (em); +btrfs_free_extent_map (em);return ret; }
@@ -2902,7 +2902,7 @@ static int btrfs_zero_range(struct inode *inode,* do nothing except updating the inode's i_size if * needed. */ -free_extent_map (em); +btrfs_free_extent_map (em); ret =btrfs_fallocate_update_isize (inode, offset + len, mode); goto out;
@@ -2917,7 +2917,7 @@ static int btrfs_zero_range(struct inode *inode, offset = alloc_start; alloc_hint =btrfs_extent_map_block_start (em) + em->len; } -free_extent_map (em); +btrfs_free_extent_map (em);if (BTRFS_BYTES_TO_BLKS (fs_info, offset) ==BTRFS_BYTES_TO_BLKS (fs_info, offset + len -1 )) {
@@ -2928,13 +2928,13 @@ static int btrfs_zero_range(struct inode *inode, }if (em->flags &EXTENT_FLAG_PREALLOC ) { -free_extent_map (em); +btrfs_free_extent_map (em); ret =btrfs_fallocate_update_isize (inode, offset + len, mode); goto out; }if (len < sectorsize && em->disk_bytenr !=EXTENT_MAP_HOLE ) { -free_extent_map (em); +btrfs_free_extent_map (em); ret =btrfs_truncate_block (BTRFS_I (inode), offset, len,0 );if (!ret)
@@ -2943,7 +2943,7 @@ static int btrfs_zero_range(struct inode *inode, mode);return ret; } -free_extent_map (em); +btrfs_free_extent_map (em); alloc_start =round_down (offset, sectorsize); alloc_end = alloc_start + sectorsize; goto reserve_space;
@@ -3153,19 +3153,19 @@ static long btrfs_fallocate(struct file *file, int mode, ret =add_falloc_range (&reserve_list, cur_offset, range_len);if (ret <0 ) { -free_extent_map (em); +btrfs_free_extent_map (em);break ; } ret =btrfs_qgroup_reserve_data (BTRFS_I (inode), &data_reserved, cur_offset, range_len);if (ret <0 ) { -free_extent_map (em); +btrfs_free_extent_map (em);break ; } qgroup_reserved += range_len; data_space_needed += range_len; } -free_extent_map (em); +btrfs_free_extent_map (em); cur_offset = last_byte; }
fs/btrfs/inode.c +24 -24
174 lines not on this page · raw message
fs/btrfs/relocation.c +2 -2
@@ -2764,7 +2764,7 @@ static noinline_for_stack int setup_relocation_extent_mapping(struct reloc_contru64 end = rc->cluster.end - offset;int ret =0 ; - em =alloc_extent_map (); + em =btrfs_alloc_extent_map ();if (!em)return -ENOMEM ;
@@ -2778,7 +2778,7 @@ static noinline_for_stack int setup_relocation_extent_mapping(struct reloc_contrbtrfs_lock_extent (&inode->io_tree, start, end, &cached_state); ret =btrfs_replace_extent_map_range (inode, em, false);btrfs_unlock_extent (&inode->io_tree, start, end, &cached_state); -free_extent_map (em); +btrfs_free_extent_map (em);return ret; }
fs/btrfs/tests/extent-map-tests.c +38 -38
265 lines not on this page · raw message
fs/btrfs/tests/inode-tests.c +20 -20
@@ -268,7 +268,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)test_err ("expected a hole, got %llu" , em->disk_bytenr); goto out; } -free_extent_map (em); +btrfs_free_extent_map (em);btrfs_drop_extent_map_range (BTRFS_I (inode),0 , (u64)-1 , false);/*
@@ -314,7 +314,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)* this? */ offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -336,7 +336,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* Regular extent */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);
@@ -363,7 +363,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* The next 3 are split extents */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);
@@ -392,7 +392,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) disk_bytenr =btrfs_extent_map_block_start (em); orig_start = em->start; offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -414,7 +414,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -447,7 +447,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* Prealloc extent */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);
@@ -475,7 +475,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* The next 3 are a half written prealloc extent */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);
@@ -505,7 +505,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) disk_bytenr =btrfs_extent_map_block_start (em); orig_start = em->start; offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -537,7 +537,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -570,7 +570,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* Now for the compressed extent */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);
@@ -603,7 +603,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* Split compressed extent */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);
@@ -638,7 +638,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) disk_bytenr =btrfs_extent_map_block_start (em); orig_start = em->start; offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -664,7 +664,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -698,7 +698,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em);/* A hole between regular extents but no hole extent */ em =btrfs_get_extent (BTRFS_I (inode),NULL , offset +6 , sectorsize);
@@ -725,7 +725,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset,SZ_4M );if (IS_ERR (em)) {
@@ -757,7 +757,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) goto out; } offset = em->start + em->len; -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , offset, sectorsize);if (IS_ERR (em)) {
@@ -785,7 +785,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) ret =0 ; out:if (!IS_ERR (em)) -free_extent_map (em); +btrfs_free_extent_map (em);iput (inode);btrfs_free_dummy_root (root);btrfs_free_dummy_fs_info (fs_info);
@@ -858,7 +858,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize) em->flags); goto out; } -free_extent_map (em); +btrfs_free_extent_map (em); em =btrfs_get_extent (BTRFS_I (inode),NULL , sectorsize,2 * sectorsize);if (IS_ERR (em)) {
@@ -884,7 +884,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize) ret =0 ; out:if (!IS_ERR (em)) -free_extent_map (em); +btrfs_free_extent_map (em);iput (inode);btrfs_free_dummy_root (root);btrfs_free_dummy_fs_info (fs_info);
fs/btrfs/tree-log.c +2 -2
@@ -4957,7 +4957,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,*/ if (ret) {clear_em_logging (inode, em); -free_extent_map (em); +btrfs_free_extent_map (em);continue ; }
@@ -4966,7 +4966,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans, ret =log_one_extent (trans, inode, em, path, ctx);write_lock (&tree->lock);clear_em_logging (inode, em); -free_extent_map (em); +btrfs_free_extent_map (em); }WARN_ON (!list_empty (&extents));write_unlock (&tree->lock);
fs/btrfs/zoned.c +1 -1
@@ -1788,7 +1788,7 @@ static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered,/* The em should be a new COW extent, thus it should not have an offset. */ ASSERT (em->offset ==0 ); em->disk_bytenr = logical; -free_extent_map (em); +btrfs_free_extent_map (em);write_unlock (&em_tree->lock); }
Signature · 1 line
2.45.2
PATCH 4/6 btrfs: rename remaining exported extent map functions
In reply to [email protected]From: Filipe Manana <[email protected]>
Rename all the exported functions from extent_map.h that don't have a 'btrfs_' prefix in their names, so that they are consistent with all the other functions, to make it clear they are btrfs specific functions and to avoid potential name collisions in the future with functions defined elsewhere in the kernel.
--- fs/btrfs/compression.c | 4 ++-- fs/btrfs/defrag.c | 2 +- fs/btrfs/direct-io.c | 6 ++--- fs/btrfs/disk-io.c | 2 +- fs/btrfs/extent_io.c | 4 ++-- fs/btrfs/extent_map.c | 38 +++++++++++++++---------------- fs/btrfs/extent_map.h | 24 +++++++++---------- fs/btrfs/inode.c | 12 +++++----- fs/btrfs/super.c | 4 ++-- fs/btrfs/tests/extent-map-tests.c | 12 +++++----- fs/btrfs/tree-log.c | 4 ++-- fs/btrfs/zoned.c | 8 +++---- 12 files changed, 60 insertions(+), 60 deletions(-)
fs/btrfs/compression.c +2 -2
@@ -501,7 +501,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, page_end = (pg_index <<PAGE_SHIFT ) +folio_size (folio) -1 ;btrfs_lock_extent (tree, cur, page_end,NULL );read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree, cur, page_end +1 - cur); + em =btrfs_lookup_extent_mapping (em_tree, cur, page_end +1 - cur);read_unlock (&em_tree->lock);/*
@@ -581,7 +581,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)/* we need the actual starting offset of this extent in the file */ read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree, file_offset, fs_info->sectorsize); + em =btrfs_lookup_extent_mapping (em_tree, file_offset, fs_info->sectorsize);read_unlock (&em_tree->lock);if (!em) { ret =BLK_STS_IOERR ;
fs/btrfs/defrag.c +1 -1
@@ -753,7 +753,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start,* full extent lock. */ read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree, start, sectorsize); + em =btrfs_lookup_extent_mapping (em_tree, start, sectorsize);read_unlock (&em_tree->lock);/*
fs/btrfs/direct-io.c +3 -3
@@ -692,9 +692,9 @@ static int btrfs_extract_ordered_extent(struct btrfs_bio *bbio,* a pre-existing one. */ if (!test_bit (BTRFS_ORDERED_NOCOW , &ordered->flags)) { - ret =split_extent_map (bbio->inode, bbio->file_offset, - ordered->num_bytes, len, - ordered->disk_bytenr); + ret =btrfs_split_extent_map (bbio->inode, bbio->file_offset, + ordered->num_bytes, len, + ordered->disk_bytenr);if (ret)return ret; }
fs/btrfs/disk-io.c +1 -1
@@ -1922,7 +1922,7 @@ static int btrfs_init_btree_inode(struct super_block *sb)btrfs_extent_io_tree_init (fs_info, &BTRFS_I (inode)->io_tree,IO_TREE_BTREE_INODE_IO ); -extent_map_tree_init (&BTRFS_I (inode)->extent_tree); +btrfs_extent_map_tree_init (&BTRFS_I (inode)->extent_tree);BTRFS_I (inode)->root =btrfs_grab_root (fs_info->tree_root);set_bit (BTRFS_INODE_DUMMY , &BTRFS_I (inode)->runtime_flags);
fs/btrfs/extent_io.c +2 -2
@@ -2666,7 +2666,7 @@ bool try_release_extent_mapping(struct folio *folio, gfp_t mask)struct extent_map *em;write_lock (&extent_tree->lock); - em =lookup_extent_mapping (extent_tree, start, len); + em =btrfs_lookup_extent_mapping (extent_tree, start, len);if (!em) {write_unlock (&extent_tree->lock);break ;
@@ -2705,7 +2705,7 @@ bool try_release_extent_mapping(struct folio *folio, gfp_t mask)* fsync performance for workloads with a data size that exceeds * or is close to the system's memory). */ -remove_extent_mapping (inode, em); +btrfs_remove_extent_mapping (inode, em);/* Once for the inode's extent map tree. */ btrfs_free_extent_map (em); next:
fs/btrfs/extent_map.c +19 -19
@@ -13,7 +13,7 @@static struct kmem_cache *extent_map_cache; -int __init extent_map_init (void ) +int __init btrfs_extent_map_init (void ) { extent_map_cache =kmem_cache_create ("btrfs_extent_map" ,sizeof (struct extent_map ),0 ,0 ,NULL );
@@ -22,7 +22,7 @@ int __init extent_map_init(void)return 0 ; } -void __cold extent_map_exit (void ) +void __cold btrfs_extent_map_exit (void ) {kmem_cache_destroy (extent_map_cache); }
@@ -31,7 +31,7 @@ void __cold extent_map_exit(void)* Initialize the extent tree @tree. Should be called for each new inode or * other user of the extent_map interface. */ -void extent_map_tree_init (struct extent_map_tree *tree) +void btrfs_extent_map_tree_init (struct extent_map_tree *tree) { tree->root =RB_ROOT ;INIT_LIST_HEAD (&tree->modified_extents);
@@ -409,7 +409,7 @@ static void try_merge_map(struct btrfs_inode *inode, struct extent_map *em)* -ENOENT when the extent is not found in the tree * -EUCLEAN if the found extent does not match the expected start */ -int unpin_extent_cache (struct btrfs_inode *inode,u64 start,u64 len,u64 gen) +int btrfs_unpin_extent_cache (struct btrfs_inode *inode,u64 start,u64 len,u64 gen) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct extent_map_tree *tree = &inode->extent_tree;
@@ -417,7 +417,7 @@ int unpin_extent_cache(struct btrfs_inode *inode, u64 start, u64 len, u64 gen)struct extent_map *em;write_lock (&tree->lock); - em =lookup_extent_mapping (tree, start, len); + em =btrfs_lookup_extent_mapping (tree, start, len);if (WARN_ON (!em)) { btrfs_warn(fs_info,
@@ -449,7 +449,7 @@ int unpin_extent_cache(struct btrfs_inode *inode, u64 start, u64 len, u64 gen) } -void clear_em_logging (struct btrfs_inode *inode,struct extent_map *em) +void btrfs_clear_em_logging (struct btrfs_inode *inode,struct extent_map *em) {lockdep_assert_held_write (&inode->extent_tree.lock);
@@ -546,8 +546,8 @@ __lookup_extent_mapping(struct extent_map_tree *tree,* intersect, so check the object returned carefully to make sure that no * additional lookups are needed. */ -struct extent_map *lookup_extent_mapping (struct extent_map_tree *tree, -u64 start,u64 len) +struct extent_map *btrfs_lookup_extent_mapping (struct extent_map_tree *tree, +u64 start,u64 len) {return __lookup_extent_mapping (tree, start, len,1 ); }
@@ -564,8 +564,8 @@ struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,* * If one can't be found, any nearby extent may be returned */ -struct extent_map *search_extent_mapping (struct extent_map_tree *tree, -u64 start,u64 len) +struct extent_map *btrfs_search_extent_mapping (struct extent_map_tree *tree, +u64 start,u64 len) {return __lookup_extent_mapping (tree, start, len,0 ); }
@@ -579,7 +579,7 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree,* Remove @em from the extent tree of @inode. No reference counts are dropped, * and no checks are done to see if the range is in use. */ -void remove_extent_mapping (struct btrfs_inode *inode,struct extent_map *em) +void btrfs_remove_extent_mapping (struct btrfs_inode *inode,struct extent_map *em) {struct extent_map_tree *tree = &inode->extent_tree;
@@ -716,7 +716,7 @@ int btrfs_add_extent_mapping(struct btrfs_inode *inode,if (ret == -EEXIST ) {struct extent_map *existing; - existing =search_extent_mapping (&inode->extent_tree, start, len); + existing =btrfs_search_extent_mapping (&inode->extent_tree, start, len);trace_btrfs_handle_em_exist (fs_info, existing, em, start, len);
@@ -772,7 +772,7 @@ static void drop_all_extent_maps_fast(struct btrfs_inode *inode) em = rb_entry(node, struct extent_map, rb_node); em->flags &= ~(EXTENT_FLAG_PINNED |EXTENT_FLAG_LOGGING ); -remove_extent_mapping (inode, em); +btrfs_remove_extent_mapping (inode, em);btrfs_free_extent_map (em);if (cond_resched_rwlock_write (&tree->lock))
@@ -830,7 +830,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end, split2 =btrfs_alloc_extent_map ();write_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree, start, len); + em =btrfs_lookup_extent_mapping (em_tree, start, len);while (em) {/* extent_map_end() returns exclusive value (last byte + 1). */
@@ -965,7 +965,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,ASSERT (!split);btrfs_set_inode_full_sync (inode); } -remove_extent_mapping (inode, em); +btrfs_remove_extent_mapping (inode, em); }/*
@@ -1033,8 +1033,8 @@ int btrfs_replace_extent_map_range(struct btrfs_inode *inode,* * This function is used when an ordered_extent needs to be split. */ -int split_extent_map (struct btrfs_inode *inode,u64 start,u64 len,u64 pre, -u64 new_logical) +int btrfs_split_extent_map (struct btrfs_inode *inode,u64 start,u64 len,u64 pre, +u64 new_logical) {struct extent_map_tree *em_tree = &inode->extent_tree;struct extent_map *em;
@@ -1057,7 +1057,7 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,btrfs_lock_extent (&inode->io_tree, start, start + len -1 ,NULL );write_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree, start, len); + em =btrfs_lookup_extent_mapping (em_tree, start, len);if (!em) { ret = -EIO ; goto out_unlock;
@@ -1168,7 +1168,7 @@ static long btrfs_scan_inode(struct btrfs_inode *inode, struct btrfs_em_shrink_cif (!list_empty (&em->list) && em->generation >= cur_fs_gen)btrfs_set_inode_full_sync (inode); -remove_extent_mapping (inode, em); +btrfs_remove_extent_mapping (inode, em);trace_btrfs_extent_map_shrinker_remove_em (inode, em);/* Drop the reference for the tree. */ btrfs_free_extent_map (em);
fs/btrfs/extent_map.h +12 -12
@@ -167,21 +167,21 @@ static inline u64 btrfs_extent_map_end(const struct extent_map *em)return em->start + em->len; } -void extent_map_tree_init (struct extent_map_tree *tree); -struct extent_map *lookup_extent_mapping (struct extent_map_tree *tree, -u64 start,u64 len); -void remove_extent_mapping (struct btrfs_inode *inode,struct extent_map *em); -int split_extent_map (struct btrfs_inode *inode,u64 start,u64 len,u64 pre, -u64 new_logical); +void btrfs_extent_map_tree_init (struct extent_map_tree *tree); +struct extent_map *btrfs_lookup_extent_mapping (struct extent_map_tree *tree, +u64 start,u64 len); +void btrfs_remove_extent_mapping (struct btrfs_inode *inode,struct extent_map *em); +int btrfs_split_extent_map (struct btrfs_inode *inode,u64 start,u64 len,u64 pre, +u64 new_logical);struct extent_map *btrfs_alloc_extent_map (void );void btrfs_free_extent_map (struct extent_map *em); -int __init extent_map_init (void ); -void __cold extent_map_exit (void ); -int unpin_extent_cache (struct btrfs_inode *inode,u64 start,u64 len,u64 gen); -void clear_em_logging (struct btrfs_inode *inode,struct extent_map *em); -struct extent_map *search_extent_mapping (struct extent_map_tree *tree, -u64 start,u64 len); +int __init btrfs_extent_map_init (void ); +void __cold btrfs_extent_map_exit (void ); +int btrfs_unpin_extent_cache (struct btrfs_inode *inode,u64 start,u64 len,u64 gen); +void btrfs_clear_em_logging (struct btrfs_inode *inode,struct extent_map *em); +struct extent_map *btrfs_search_extent_mapping (struct extent_map_tree *tree, +u64 start,u64 len);int btrfs_add_extent_mapping (struct btrfs_inode *inode,struct extent_map **em_in,u64 start,u64 len); void btrfs_drop_extent_map_range(struct btrfs_inode *inode,
fs/btrfs/inode.c +6 -6
@@ -1203,7 +1203,7 @@ u64 btrfs_get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,u64 alloc_hint =0 ;read_lock (&em_tree->lock); - em =search_extent_mapping (em_tree, start, num_bytes); + em =btrfs_search_extent_mapping (em_tree, start, num_bytes);if (em) {/* * if block start isn't an actual block number then find the
@@ -1212,7 +1212,7 @@ u64 btrfs_get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,*/ if (em->disk_bytenr >=EXTENT_MAP_LAST_BYTE ) {btrfs_free_extent_map (em); - em =search_extent_mapping (em_tree,0 ,0 ); + em =btrfs_search_extent_mapping (em_tree,0 ,0 );if (em && em->disk_bytenr <EXTENT_MAP_LAST_BYTE ) alloc_hint =btrfs_extent_map_block_start (em);if (em)
@@ -3185,8 +3185,8 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) goto out; } - ret =unpin_extent_cache (inode, ordered_extent->file_offset, - ordered_extent->num_bytes, trans->transid); + ret =btrfs_unpin_extent_cache (inode, ordered_extent->file_offset, + ordered_extent->num_bytes, trans->transid);if (ret <0 ) {btrfs_abort_transaction (trans, ret); goto out;
@@ -6867,7 +6867,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,struct extent_map_tree *em_tree = &inode->extent_tree;read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree, start, len); + em =btrfs_lookup_extent_mapping (em_tree, start, len);read_unlock (&em_tree->lock);if (em) {
@@ -7732,7 +7732,7 @@ struct inode *btrfs_alloc_inode(struct super_block *sb) ei->i_otime_nsec =0 ; inode = &ei->vfs_inode; -extent_map_tree_init (&ei->extent_tree); +btrfs_extent_map_tree_init (&ei->extent_tree);/* This io tree sets the valid inode. */ btrfs_extent_io_tree_init (fs_info, &ei->io_tree,IO_TREE_INODE_IO );
fs/btrfs/super.c +2 -2
@@ -2534,8 +2534,8 @@ static const struct init_sequence mod_init_seq[] = { .init_func = btrfs_bioset_init, .exit_func = btrfs_bioset_exit, }, { - .init_func = extent_map_init, - .exit_func = extent_map_exit, + .init_func = btrfs_extent_map_init, + .exit_func = btrfs_extent_map_exit,#ifdef CONFIG_BTRFS_EXPERIMENTAL }, { .init_func = btrfs_read_policy_init,
fs/btrfs/tests/extent-map-tests.c +6 -6
@@ -22,7 +22,7 @@ static int free_extent_map_tree(struct btrfs_inode *inode)while (!RB_EMPTY_ROOT (&em_tree->root)) { node =rb_first (&em_tree->root); em = rb_entry(node, struct extent_map, rb_node); -remove_extent_mapping (inode, em); +btrfs_remove_extent_mapping (inode, em);#ifdef CONFIG_BTRFS_DEBUG if (refcount_read (&em->refs) !=1 ) {
@@ -826,7 +826,7 @@ static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)/* Make sure our extent maps look sane. */ ret = -EINVAL ; - em =lookup_extent_mapping (em_tree,0 ,SZ_16K ); + em =btrfs_lookup_extent_mapping (em_tree,0 ,SZ_16K );if (!em) {test_err ("didn't find an em at 0 as expected" ); goto out;
@@ -845,7 +845,7 @@ static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)btrfs_free_extent_map (em);read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree,SZ_16K ,SZ_16K ); + em =btrfs_lookup_extent_mapping (em_tree,SZ_16K ,SZ_16K );read_unlock (&em_tree->lock);if (em) {test_err ("found an em when we weren't expecting one" );
@@ -853,7 +853,7 @@ static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode) }read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree,SZ_32K ,SZ_16K ); + em =btrfs_lookup_extent_mapping (em_tree,SZ_32K ,SZ_16K );read_unlock (&em_tree->lock);if (!em) {test_err ("didn't find an em at 32K as expected" );
@@ -879,7 +879,7 @@ static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)btrfs_free_extent_map (em);read_lock (&em_tree->lock); - em =lookup_extent_mapping (em_tree,48 *SZ_1K , (u64)-1 ); + em =btrfs_lookup_extent_mapping (em_tree,48 *SZ_1K , (u64)-1 );read_unlock (&em_tree->lock);if (em) {test_err ("found an unexpected em above 48K" );
@@ -890,7 +890,7 @@ static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode) out:btrfs_free_extent_map (em);/* Unpin our extent to prevent warning when removing it below. */ - ret2 =unpin_extent_cache (inode,0 ,SZ_16K ,0 ); + ret2 =btrfs_unpin_extent_cache (inode,0 ,SZ_16K ,0 );if (ret ==0 ) ret = ret2; ret2 =free_extent_map_tree (inode);
fs/btrfs/tree-log.c +2 -2
@@ -4956,7 +4956,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,* private list. */ if (ret) { -clear_em_logging (inode, em); +btrfs_clear_em_logging (inode, em);btrfs_free_extent_map (em);continue ; }
@@ -4965,7 +4965,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans, ret =log_one_extent (trans, inode, em, path, ctx);write_lock (&tree->lock); -clear_em_logging (inode, em); +btrfs_clear_em_logging (inode, em);btrfs_free_extent_map (em); }WARN_ON (!list_empty (&extents));
fs/btrfs/zoned.c +4 -4
@@ -1783,8 +1783,8 @@ static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered, ordered->disk_bytenr = logical;write_lock (&em_tree->lock); - em =search_extent_mapping (em_tree, ordered->file_offset, - ordered->num_bytes); + em =btrfs_search_extent_mapping (em_tree, ordered->file_offset, + ordered->num_bytes);/* The em should be a new COW extent, thus it should not have an offset. */ ASSERT (em->offset ==0 ); em->disk_bytenr = logical;
@@ -1798,8 +1798,8 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,struct btrfs_ordered_extent *new;if (!test_bit (BTRFS_ORDERED_NOCOW , &ordered->flags) && -split_extent_map (ordered->inode, ordered->file_offset, - ordered->num_bytes, len, logical)) +btrfs_split_extent_map (ordered->inode, ordered->file_offset, + ordered->num_bytes, len, logical))return false; new =btrfs_split_ordered_extent (ordered, len);
Signature · 1 line
2.45.2
PATCH 5/6 btrfs: rename __lookup_extent_mapping() to remove double underscore prefix
In reply to [email protected]From: Filipe Manana <[email protected]>
There's no need to have a double underscore prefix as there's no variant of the function without it anymore.
--- fs/btrfs/extent_map.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/btrfs/extent_map.c +4 -5
@@ -508,9 +508,8 @@ static int add_extent_mapping(struct btrfs_inode *inode,return 0 ; } -static struct extent_map * -__lookup_extent_mapping (struct extent_map_tree *tree, -u64 start,u64 len,int strict) +static struct extent_map *lookup_extent_mapping (struct extent_map_tree *tree, +u64 start,u64 len,int strict) {struct extent_map *em;struct rb_node *rb_node;
@@ -549,7 +548,7 @@ __lookup_extent_mapping(struct extent_map_tree *tree,struct extent_map *btrfs_lookup_extent_mapping (struct extent_map_tree *tree,u64 start,u64 len) { -return __lookup_extent_mapping (tree, start, len,1 ); +return lookup_extent_mapping (tree, start, len,1 ); }/*
@@ -567,7 +566,7 @@ struct extent_map *btrfs_lookup_extent_mapping(struct extent_map_tree *tree,struct extent_map *btrfs_search_extent_mapping (struct extent_map_tree *tree,u64 start,u64 len) { -return __lookup_extent_mapping (tree, start, len,0 ); +return lookup_extent_mapping (tree, start, len,0 ); }/*
Signature · 1 line
2.45.2
PATCH 6/6 btrfs: rename __tree_search() to remove double underscore prefix
In reply to [email protected]From: Filipe Manana <[email protected]>
There's no need to have a double underscore prefix as there's no variant of the function without it.
--- fs/btrfs/extent_map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/extent_map.c +3 -3
@@ -136,8 +136,8 @@ static int tree_insert(struct rb_root *root, struct extent_map *em)* Search through the tree for an extent_map with a given offset. If it can't * be found, try to find some neighboring extents */ -static struct rb_node *__tree_search (struct rb_root *root,u64 offset, -struct rb_node **prev_or_next_ret) +static struct rb_node *tree_search (struct rb_root *root,u64 offset, +struct rb_node **prev_or_next_ret) {struct rb_node *n = root->rb_node;struct rb_node *prev =NULL ;
@@ -516,7 +516,7 @@ static struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,struct rb_node *prev_or_next =NULL ;u64 end =range_end (start, len); - rb_node =__tree_search (&tree->root, start, &prev_or_next); + rb_node =tree_search (&tree->root, start, &prev_or_next);if (!rb_node) {if (prev_or_next) rb_node = prev_or_next;
Signature · 1 line
2.45.2
Quoted 12 lines · On Tue, Apr 08, 2025 at 06:32:53PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
Many of the exported functions from
extent_map.hdon't have a 'btrfs_' prefix, but some have, making it inconsistent and also against the coding style conventions. I've added myself some of them recently, to get and set compression on an extent map, and ended up not adding the prefix since the other functions in the file didn't have the prefix, just to make things consistent. So rename the ones without the prefix to have it.I've split this into more reasonably sized patches to avoid having a huge patch and make things easier to review.
Quoted 7 lines
Filipe Manana (6):
btrfs: rename exported extent map compression functions
btrfs: rename extent map functions to get block start, end and check if in tree
btrfs: rename functions to allocate and free extent maps
btrfs: rename remaining exported extent map functions
btrfs: rename__lookup_extent_mapping()to remove double underscore prefix
btrfs: rename__tree_search()to remove double underscore prefix