|
@@ -2333,13 +2333,11 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end)
|
|
|
static void end_bio_extent_writepage(struct bio *bio, int err)
|
|
|
{
|
|
|
struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
|
|
|
- struct extent_io_tree *tree;
|
|
|
u64 start;
|
|
|
u64 end;
|
|
|
|
|
|
do {
|
|
|
struct page *page = bvec->bv_page;
|
|
|
- tree = &BTRFS_I(page->mapping->host)->io_tree;
|
|
|
|
|
|
/* We always issue full-page reads, but if some block
|
|
|
* in a page fails to read, blk_update_request() will
|
|
@@ -4082,12 +4080,10 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
|
|
|
struct extent_map *em = NULL;
|
|
|
struct extent_state *cached_state = NULL;
|
|
|
struct btrfs_path *path;
|
|
|
- struct btrfs_file_extent_item *item;
|
|
|
int end = 0;
|
|
|
u64 em_start = 0;
|
|
|
u64 em_len = 0;
|
|
|
u64 em_end = 0;
|
|
|
- unsigned long emflags;
|
|
|
|
|
|
if (len == 0)
|
|
|
return -EINVAL;
|
|
@@ -4112,8 +4108,6 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
|
|
|
}
|
|
|
WARN_ON(!ret);
|
|
|
path->slots[0]--;
|
|
|
- item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
- struct btrfs_file_extent_item);
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &found_key, path->slots[0]);
|
|
|
found_type = btrfs_key_type(&found_key);
|
|
|
|
|
@@ -4181,7 +4175,6 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
|
|
|
offset_in_extent = em_start - em->start;
|
|
|
em_end = extent_map_end(em);
|
|
|
em_len = em_end - em_start;
|
|
|
- emflags = em->flags;
|
|
|
disko = 0;
|
|
|
flags = 0;
|
|
|
|