Commit 208d6341 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: remove btree_get_extent 



The sole purpose of this function was to satisfy the requirements of
__do_readpage. Since that function is no longer used to read metadata
pages the need to keep btree_get_extent around has also disappeared.
Simply remove it.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 0420177c

fs/btrfs/disk-io.c

+0 −47
Original line number Diff line number Diff line
@@ -204,53 +204,6 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, 


#endif



/*

 * extents on the btree inode are pretty simple, there's one extent

 * that covers the entire device

 */

struct extent_map *btree_get_extent(struct btrfs_inode *inode,

				    struct page *page, size_t pg_offset,

				    u64 start, u64 len)

{

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct extent_map *em;

	int ret;



	read_lock(&em_tree->lock);

	em = lookup_extent_mapping(em_tree, start, len);

	if (em) {

		read_unlock(&em_tree->lock);

		goto out;

	}

	read_unlock(&em_tree->lock);



	em = alloc_extent_map();

	if (!em) {

		em = ERR_PTR(-ENOMEM);

		goto out;

	}

	em->start = 0;

	em->len = (u64)-1;

	em->block_len = (u64)-1;

	em->block_start = 0;



	write_lock(&em_tree->lock);

	ret = add_extent_mapping(em_tree, em, 0);

	if (ret == -EEXIST) {

		free_extent_map(em);

		em = lookup_extent_mapping(em_tree, start, len);

		if (!em)

			em = ERR_PTR(-EIO);

	} else if (ret) {

		free_extent_map(em);

		em = ERR_PTR(ret);

	}

	write_unlock(&em_tree->lock);



out:

	return em;

}



/*

 * Compute the csum of a btree block and store the result to provided buffer.

 */

fs/btrfs/disk-io.h

+0 −3
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
				     u64 objectid);

int btree_lock_page_hook(struct page *page, void *data,

				void (*flush_fn)(void *));

struct extent_map *btree_get_extent(struct btrfs_inode *inode,

				    struct page *page, size_t pg_offset,

				    u64 start, u64 len);

int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags);

int __init btrfs_end_io_wq_init(void);

void __cold btrfs_end_io_wq_exit(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE