Commit 962162ff authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: rename exported extent map compression functions 



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: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cff6df10

fs/btrfs/compression.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -972,7 +972,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;
@@ -1547,7 +1547,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
Original line number Diff line number Diff line
@@ -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 ext 
	u64 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_map 
		if (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));