From 145a5969bd5c8a276128b54217d0a6459c8a3af8 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Fri, 25 Aug 2017 18:07:15 +0200
Subject: btrfs-progs: drop blocksize argument from readahead_tree_block

Tree blocks are always nodesize. As readahead is only an optimization,
exact size is not required and is only advisory.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 cmds-check.c | 6 ++----
 ctree.c      | 2 +-
 disk-io.c    | 8 ++++----
 disk-io.h    | 2 +-
 image/main.c | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cmds-check.c b/cmds-check.c
index cc235d08..5df46306 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -1989,8 +1989,7 @@ static void reada_walk_down(struct btrfs_root *root,
 	for (i = slot; i < nritems; i++) {
 		bytenr = btrfs_node_blockptr(node, i);
 		ptr_gen = btrfs_node_ptr_generation(node, i);
-		readahead_tree_block(fs_info, bytenr, fs_info->nodesize,
-				ptr_gen);
+		readahead_tree_block(fs_info, bytenr, ptr_gen);
 	}
 }
 
@@ -7650,8 +7649,7 @@ static int run_next_block(struct btrfs_root *root,
 				continue;
 
 			/* fixme, get the parent transid */
-			readahead_tree_block(fs_info, bits[i].start,
-					     bits[i].size, 0);
+			readahead_tree_block(fs_info, bits[i].start, 0);
 		}
 	}
 	*last = bits[0].start;
diff --git a/ctree.c b/ctree.c
index 8d081880..4fc33b14 100644
--- a/ctree.c
+++ b/ctree.c
@@ -1018,7 +1018,7 @@ 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(fs_info, search, fs_info->nodesize,
+			readahead_tree_block(fs_info, search,
 				     btrfs_node_ptr_generation(node, nr));
 			nread += fs_info->nodesize;
 		}
diff --git a/disk-io.c b/disk-io.c
index f05a0bf3..ef7633d4 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -189,21 +189,21 @@ struct extent_buffer* btrfs_find_create_tree_block(
 }
 
 void readahead_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
-			  u32 blocksize, u64 parent_transid)
+		u64 parent_transid)
 {
 	struct extent_buffer *eb;
 	u64 length;
 	struct btrfs_multi_bio *multi = NULL;
 	struct btrfs_device *device;
 
-	eb = btrfs_find_tree_block(fs_info, bytenr, blocksize);
+	eb = btrfs_find_tree_block(fs_info, bytenr, fs_info->nodesize);
 	if (!(eb && btrfs_buffer_uptodate(eb, parent_transid)) &&
 	    !btrfs_map_block(fs_info, READ, bytenr, &length, &multi, 0,
 			     NULL)) {
 		device = multi->stripes[0].dev;
 		device->total_ios++;
-		blocksize = min(blocksize, (u32)SZ_64K);
-		readahead(device->fd, multi->stripes[0].physical, blocksize);
+		readahead(device->fd, multi->stripes[0].physical,
+				fs_info->nodesize);
 	}
 
 	free_extent_buffer(eb);
diff --git a/disk-io.h b/disk-io.h
index c43ab615..6e42eced 100644
--- a/disk-io.h
+++ b/disk-io.h
@@ -121,7 +121,7 @@ struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
 int read_extent_data(struct btrfs_fs_info *fs_info, char *data, u64 logical,
 		     u64 *len, int mirror);
 void readahead_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
-			  u32 blocksize, u64 parent_transid);
+			  u64 parent_transid);
 struct extent_buffer* btrfs_find_create_tree_block(
 		struct btrfs_fs_info *fs_info, u64 bytenr);
 
diff --git a/image/main.c b/image/main.c
index 8778bc2a..85f2c043 100644
--- a/image/main.c
+++ b/image/main.c
@@ -1029,7 +1029,7 @@ static int add_extent(u64 start, u64 size, struct metadump_struct *md,
 			return ret;
 		md->pending_start = start;
 	}
-	readahead_tree_block(md->root->fs_info, start, size, 0);
+	readahead_tree_block(md->root->fs_info, start, 0);
 	md->pending_size += size;
 	md->data = data;
 	return 0;
-- 
cgit v1.2.3