浏览代码

btrfs: sink blocksize parameter to reada_tree_block_flagged

Signed-off-by: David Sterba <dsterba@suse.cz>
David Sterba 11 年之前
父节点
当前提交
c0dcaa4d7b
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      fs/btrfs/disk-io.c
  2. 1 1
      fs/btrfs/disk-io.h
  3. 1 1
      fs/btrfs/reada.c

+ 2 - 2
fs/btrfs/disk-io.c

@@ -1086,7 +1086,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr)
 	free_extent_buffer(buf);
 	free_extent_buffer(buf);
 }
 }
 
 
-int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
+int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
 			 int mirror_num, struct extent_buffer **eb)
 			 int mirror_num, struct extent_buffer **eb)
 {
 {
 	struct extent_buffer *buf = NULL;
 	struct extent_buffer *buf = NULL;
@@ -1094,7 +1094,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
 	struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;
 	struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;
 	int ret;
 	int ret;
 
 
-	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);
+	buf = btrfs_find_create_tree_block(root, bytenr, root->nodesize);
 	if (!buf)
 	if (!buf)
 		return 0;
 		return 0;
 
 

+ 1 - 1
fs/btrfs/disk-io.h

@@ -47,7 +47,7 @@ struct btrfs_fs_devices;
 struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
 struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
 				      u64 parent_transid);
 				      u64 parent_transid);
 void readahead_tree_block(struct btrfs_root *root, u64 bytenr);
 void readahead_tree_block(struct btrfs_root *root, u64 bytenr);
-int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
+int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
 			 int mirror_num, struct extent_buffer **eb);
 			 int mirror_num, struct extent_buffer **eb);
 struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
 struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
 						   u64 bytenr, u32 blocksize);
 						   u64 bytenr, u32 blocksize);

+ 1 - 1
fs/btrfs/reada.c

@@ -721,7 +721,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
 
 
 	atomic_inc(&dev->reada_in_flight);
 	atomic_inc(&dev->reada_in_flight);
 	ret = reada_tree_block_flagged(fs_info->extent_root, logical,
 	ret = reada_tree_block_flagged(fs_info->extent_root, logical,
-			fs_info->tree_root->nodesize, mirror_num, &eb);
+			mirror_num, &eb);
 	if (ret)
 	if (ret)
 		__readahead_hook(fs_info->extent_root, NULL, logical, ret);
 		__readahead_hook(fs_info->extent_root, NULL, logical, ret);
 	else if (eb)
 	else if (eb)