X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ctree.c;h=4fc33b14000ad0dae26f38f9d31dfedd226e05d1;hb=a0abb062181ad97bffc5011fba6920baeee5152e;hp=a5aae5172f4bfeb8a9033dbc99677351175e270d;hpb=1618d8afb90820d50310630ec47c2c8c59c4a2e4;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/ctree.c b/ctree.c
index a5aae51..4fc33b1 100644
--- a/ctree.c
+++ b/ctree.c
@@ -650,7 +650,6 @@ struct extent_buffer *read_node_slot(struct btrfs_fs_info *fs_info,
 		return NULL;
 
 	return read_tree_block(fs_info, btrfs_node_blockptr(parent, slot),
-		       fs_info->nodesize,
 		       btrfs_node_ptr_generation(parent, slot));
 }
 
@@ -968,6 +967,7 @@ static int noinline push_nodes_for_insert(struct btrfs_trans_handle *trans,
 void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
 			     int level, int slot, u64 objectid)
 {
+	struct btrfs_fs_info *fs_info = root->fs_info;
 	struct extent_buffer *node;
 	struct btrfs_disk_key disk_key;
 	u32 nritems;
@@ -978,7 +978,6 @@ void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
 	int direction = path->reada;
 	struct extent_buffer *eb;
 	u32 nr;
-	u32 blocksize;
 	u32 nscan = 0;
 
 	if (level != 1)
@@ -989,8 +988,7 @@ void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
 
 	node = path->nodes[level];
 	search = btrfs_node_blockptr(node, slot);
-	blocksize = root->fs_info->nodesize;
-	eb = btrfs_find_tree_block(root, search, blocksize);
+	eb = btrfs_find_tree_block(fs_info, search, fs_info->nodesize);
 	if (eb) {
 		free_extent_buffer(eb);
 		return;
@@ -1020,9 +1018,9 @@ void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
 		if ((search >= lowest_read && search <= highest_read) ||
 		    (search < lowest_read && lowest_read - search <= 32768) ||
 		    (search > highest_read && search - highest_read <= 32768)) {
-			readahead_tree_block(root, search, blocksize,
+			readahead_tree_block(fs_info, search,
 				     btrfs_node_ptr_generation(node, nr));
-			nread += blocksize;
+			nread += fs_info->nodesize;
 		}
 		nscan++;
 		if (path->reada < 2 && (nread > SZ_256K || nscan > 32))