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: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 0fae2caf31efe8c5317c6a2fe59ab3e4118f6179..53b588a7e1509b5b7e9e2021af28772d73e207d8 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -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.
  */

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 00dc39d47ed346449c66e37c8f453f86428bd405..89b6a709a184389e0adb0503d5551df2e5df136b 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -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);