aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-06-14 20:24:21 -0400
committerDavid Sterba <dsterba@suse.cz>2014-12-12 12:07:20 -0500
commitc0dcaa4d7b66b788b315c418bda3cca75c5938dc (patch)
treee803cd49e551c29b5457457146657c5df1a5312e /fs
parentb6ae40ec76dc7589d9f77bd281515be3ad58c533 (diff)
btrfs: sink blocksize parameter to reada_tree_block_flagged
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c4
-rw-r--r--fs/btrfs/disk-io.h2
-rw-r--r--fs/btrfs/reada.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index be9d7c612489..8123b03b1f9d 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1086,7 +1086,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr)
1086 free_extent_buffer(buf); 1086 free_extent_buffer(buf);
1087} 1087}
1088 1088
1089int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, 1089int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
1090 int mirror_num, struct extent_buffer **eb) 1090 int mirror_num, struct extent_buffer **eb)
1091{ 1091{
1092 struct extent_buffer *buf = NULL; 1092 struct extent_buffer *buf = NULL;
@@ -1094,7 +1094,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
1094 struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree; 1094 struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;
1095 int ret; 1095 int ret;
1096 1096
1097 buf = btrfs_find_create_tree_block(root, bytenr, blocksize); 1097 buf = btrfs_find_create_tree_block(root, bytenr, root->nodesize);
1098 if (!buf) 1098 if (!buf)
1099 return 0; 1099 return 0;
1100 1100
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 9cf4359ace05..4d4ecdd9f4a2 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -47,7 +47,7 @@ struct btrfs_fs_devices;
47struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, 47struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
48 u64 parent_transid); 48 u64 parent_transid);
49void readahead_tree_block(struct btrfs_root *root, u64 bytenr); 49void readahead_tree_block(struct btrfs_root *root, u64 bytenr);
50int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, 50int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
51 int mirror_num, struct extent_buffer **eb); 51 int mirror_num, struct extent_buffer **eb);
52struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, 52struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
53 u64 bytenr, u32 blocksize); 53 u64 bytenr, u32 blocksize);
diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 5c3fde6571bb..4d3d4e5287c5 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -721,7 +721,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
721 721
722 atomic_inc(&dev->reada_in_flight); 722 atomic_inc(&dev->reada_in_flight);
723 ret = reada_tree_block_flagged(fs_info->extent_root, logical, 723 ret = reada_tree_block_flagged(fs_info->extent_root, logical,
724 fs_info->tree_root->nodesize, mirror_num, &eb); 724 mirror_num, &eb);
725 if (ret) 725 if (ret)
726 __readahead_hook(fs_info->extent_root, NULL, logical, ret); 726 __readahead_hook(fs_info->extent_root, NULL, logical, ret);
727 else if (eb) 727 else if (eb)