aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index dda8ad6c0077..6f0825b617d1 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -197,7 +197,8 @@ int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
197 WARN_ON(1); 197 WARN_ON(1);
198 } 198 }
199 eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS); 199 eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
200 read_extent_buffer_pages(tree, eb, start + PAGE_CACHE_SIZE, 1); 200 read_extent_buffer_pages(tree, eb, start + PAGE_CACHE_SIZE, 1,
201 btree_get_extent);
201 btrfs_clear_buffer_defrag(eb); 202 btrfs_clear_buffer_defrag(eb);
202 found_start = btrfs_header_bytenr(eb); 203 found_start = btrfs_header_bytenr(eb);
203 if (found_start != start) { 204 if (found_start != start) {
@@ -339,7 +340,7 @@ int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)
339 if (!buf) 340 if (!buf)
340 return 0; 341 return 0;
341 read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree, 342 read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,
342 buf, 0, 0); 343 buf, 0, 0, btree_get_extent);
343 free_extent_buffer(buf); 344 free_extent_buffer(buf);
344 return ret; 345 return ret;
345} 346}
@@ -358,7 +359,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
358 buf = btrfs_find_create_tree_block(root, bytenr, blocksize); 359 buf = btrfs_find_create_tree_block(root, bytenr, blocksize);
359 if (!buf) 360 if (!buf)
360 return NULL; 361 return NULL;
361 read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree, buf, 0, 1); 362 read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree, buf, 0, 1,
363 btree_get_extent);
362 364
363 if (buf->flags & EXTENT_CSUM) 365 if (buf->flags & EXTENT_CSUM)
364 return buf; 366 return buf;
@@ -1009,7 +1011,7 @@ int btrfs_read_buffer(struct extent_buffer *buf)
1009 struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root; 1011 struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
1010 struct inode *btree_inode = root->fs_info->btree_inode; 1012 struct inode *btree_inode = root->fs_info->btree_inode;
1011 return read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree, 1013 return read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,
1012 buf, 0, 1); 1014 buf, 0, 1, btree_get_extent);
1013} 1015}
1014 1016
1015static struct extent_io_ops btree_extent_io_ops = { 1017static struct extent_io_ops btree_extent_io_ops = {