New upstream release.

1 files changed, 203 insertions, 160 deletions

diff --git a/print-tree.c b/print-tree.c
index 5927ed35..3c585e31 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -104,8 +104,7 @@ static void print_inode_extref_item(struct extent_buffer *eb, u32 size,
 
 		read_extent_buffer(eb, namebuf, (unsigned long)(extref->name), len);
 
-		printf("\t\tinode extref index %llu parent %llu namelen %u "
-		       "name: %.*s\n",
+		printf("\t\tindex %llu parent %llu namelen %u name: %.*s\n",
 		       (unsigned long long)index,
 		       (unsigned long long)parent_objid,
 		       name_len, len, namebuf);
@@ -130,7 +129,7 @@ static void print_inode_ref_item(struct extent_buffer *eb, u32 size,
 		index = btrfs_inode_ref_index(eb, ref);
 		len = (name_len <= sizeof(namebuf))? name_len: sizeof(namebuf);
 		read_extent_buffer(eb, namebuf, (unsigned long)(ref + 1), len);
-		printf("\t\tinode ref index %llu namelen %u name: %.*s\n",
+		printf("\t\tindex %llu namelen %u name: %.*s\n",
 		       (unsigned long long)index, name_len, len, namebuf);
 		len = sizeof(*ref) + name_len;
 		ref = (struct btrfs_inode_ref *)((char *)ref + len);
@@ -195,13 +194,21 @@ static void qgroup_flags_to_str(u64 flags, char *ret)
 		strcat(ret, "|INCONSISTENT");
 }
 
-void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
+void print_chunk_item(struct extent_buffer *eb, struct btrfs_chunk *chunk)
 {
 	u16 num_stripes = btrfs_chunk_num_stripes(eb, chunk);
 	int i;
-	u32 chunk_item_size = btrfs_chunk_item_size(num_stripes);
+	u32 chunk_item_size;
 	char chunk_flags_str[32] = {0};
 
+	/* The chunk must contain at least one stripe */
+	if (num_stripes < 1) {
+		printf("invalid num_stripes: %u\n", num_stripes);
+		return;
+	}
+
+	chunk_item_size = btrfs_chunk_item_size(num_stripes);
+
 	if ((unsigned long)chunk + chunk_item_size > eb->len) {
 		printf("\t\tchunk item invalid\n");
 		return;
@@ -316,6 +323,9 @@ static void compress_type_to_str(u8 compress_type, char *ret)
 	case BTRFS_COMPRESS_LZO:
 		strcpy(ret, "lzo");
 		break;
+	case BTRFS_COMPRESS_ZSTD:
+		strcpy(ret, "zstd");
+		break;
 	default:
 		sprintf(ret, "UNKNOWN.%d", compress_type);
 	}
@@ -417,7 +427,7 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 		struct btrfs_extent_item_v0 *ei0;
 		BUG_ON(item_size != sizeof(*ei0));
 		ei0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_item_v0);
-		printf("\t\textent refs %u\n",
+		printf("\t\trefs %u\n",
 		       btrfs_extent_refs_v0(eb, ei0));
 		return;
 #else
@@ -429,7 +439,7 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 	flags = btrfs_extent_flags(eb, ei);
 	extent_flags_to_str(flags, flags_str);
 
-	printf("\t\textent refs %llu gen %llu flags %s\n",
+	printf("\t\trefs %llu gen %llu flags %s\n",
 	       (unsigned long long)btrfs_extent_refs(eb, ei),
 	       (unsigned long long)btrfs_extent_generation(eb, ei),
 	       flags_str);
@@ -541,7 +551,7 @@ static void root_flags_to_str(u64 flags, char *ret)
 		strcat(ret, "none");
 }
 
-static void print_root(struct extent_buffer *leaf, int slot)
+static void print_root_item(struct extent_buffer *leaf, int slot)
 {
 	struct btrfs_root_item *ri;
 	struct btrfs_root_item root_item;
@@ -873,7 +883,7 @@ static void print_inode_item(struct extent_buffer *eb,
 
 	memset(flags_str, 0, sizeof(flags_str));
 	inode_flags_to_str(btrfs_inode_flags(eb, ii), flags_str);
-	printf("\t\tinode generation %llu transid %llu size %llu nbytes %llu\n"
+	printf("\t\tgeneration %llu transid %llu size %llu nbytes %llu\n"
 	       "\t\tblock group %llu mode %o links %u uid %u gid %u rdev %llu\n"
 	       "\t\tsequence %llu flags 0x%llx(%s)\n",
 	       (unsigned long long)btrfs_inode_generation(eb, ii),
@@ -956,6 +966,165 @@ static void print_dev_stats(struct extent_buffer *eb,
 	}
 }
 
+static void print_block_group_item(struct extent_buffer *eb,
+		struct btrfs_block_group_item *bgi)
+{
+	struct btrfs_block_group_item bg_item;
+	char flags_str[256];
+
+	read_extent_buffer(eb, &bg_item, (unsigned long)bgi, sizeof(bg_item));
+	memset(flags_str, 0, sizeof(flags_str));
+	bg_flags_to_str(btrfs_block_group_flags(&bg_item), flags_str);
+	printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
+		(unsigned long long)btrfs_block_group_used(&bg_item),
+		(unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
+		flags_str);
+}
+
+static void print_extent_data_ref(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_extent_data_ref *dref;
+
+	dref = btrfs_item_ptr(eb, slot, struct btrfs_extent_data_ref);
+	printf("\t\textent data backref root %llu "
+		"objectid %llu offset %llu count %u\n",
+		(unsigned long long)btrfs_extent_data_ref_root(eb, dref),
+		(unsigned long long)btrfs_extent_data_ref_objectid(eb, dref),
+		(unsigned long long)btrfs_extent_data_ref_offset(eb, dref),
+		btrfs_extent_data_ref_count(eb, dref));
+}
+
+static void print_shared_data_ref(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_shared_data_ref *sref;
+
+	sref = btrfs_item_ptr(eb, slot, struct btrfs_shared_data_ref);
+	printf("\t\tshared data backref count %u\n",
+		btrfs_shared_data_ref_count(eb, sref));
+}
+
+static void print_free_space_info(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_free_space_info *free_info;
+
+	free_info = btrfs_item_ptr(eb, slot, struct btrfs_free_space_info);
+	printf("\t\tfree space info extent count %u flags %u\n",
+		(unsigned)btrfs_free_space_extent_count(eb, free_info),
+		(unsigned)btrfs_free_space_flags(eb, free_info));
+}
+
+static void print_dev_extent(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_dev_extent *dev_extent;
+	u8 uuid[BTRFS_UUID_SIZE];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
+
+	dev_extent = btrfs_item_ptr(eb, slot, struct btrfs_dev_extent);
+	read_extent_buffer(eb, uuid,
+		(unsigned long)btrfs_dev_extent_chunk_tree_uuid(dev_extent),
+		BTRFS_UUID_SIZE);
+	uuid_unparse(uuid, uuid_str);
+	printf("\t\tdev extent chunk_tree %llu\n"
+		"\t\tchunk_objectid %llu chunk_offset %llu "
+		"length %llu\n"
+		"\t\tchunk_tree_uuid %s\n",
+		(unsigned long long)btrfs_dev_extent_chunk_tree(eb, dev_extent),
+		(unsigned long long)btrfs_dev_extent_chunk_objectid(eb, dev_extent),
+		(unsigned long long)btrfs_dev_extent_chunk_offset(eb, dev_extent),
+		(unsigned long long)btrfs_dev_extent_length(eb, dev_extent),
+		uuid_str);
+}
+
+static void print_qgroup_status(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_qgroup_status_item *qg_status;
+	char flags_str[256];
+
+	qg_status = btrfs_item_ptr(eb, slot, struct btrfs_qgroup_status_item);
+	memset(flags_str, 0, sizeof(flags_str));
+	qgroup_flags_to_str(btrfs_qgroup_status_flags(eb, qg_status),
+					flags_str);
+	printf("\t\tversion %llu generation %llu flags %s scan %lld\n",
+		(unsigned long long)btrfs_qgroup_status_version(eb, qg_status),
+		(unsigned long long)btrfs_qgroup_status_generation(eb, qg_status),
+		flags_str,
+		(unsigned long long)btrfs_qgroup_status_rescan(eb, qg_status));
+}
+
+static void print_qgroup_info(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_qgroup_info_item *qg_info;
+
+	qg_info = btrfs_item_ptr(eb, slot, struct btrfs_qgroup_info_item);
+	printf("\t\tgeneration %llu\n"
+		"\t\treferenced %llu referenced_compressed %llu\n"
+		"\t\texclusive %llu exclusive_compressed %llu\n",
+		(unsigned long long)btrfs_qgroup_info_generation(eb, qg_info),
+		(unsigned long long)btrfs_qgroup_info_referenced(eb, qg_info),
+		(unsigned long long)btrfs_qgroup_info_referenced_compressed(eb,
+								       qg_info),
+		(unsigned long long)btrfs_qgroup_info_exclusive(eb, qg_info),
+		(unsigned long long)btrfs_qgroup_info_exclusive_compressed(eb,
+								      qg_info));
+}
+
+static void print_qgroup_limit(struct extent_buffer *eb, int slot)
+{
+	struct btrfs_qgroup_limit_item *qg_limit;
+
+	qg_limit = btrfs_item_ptr(eb, slot, struct btrfs_qgroup_limit_item);
+	printf("\t\tflags %llx\n"
+		"\t\tmax_referenced %lld max_exclusive %lld\n"
+		"\t\trsv_referenced %lld rsv_exclusive %lld\n",
+		(unsigned long long)btrfs_qgroup_limit_flags(eb, qg_limit),
+		(long long)btrfs_qgroup_limit_max_referenced(eb, qg_limit),
+		(long long)btrfs_qgroup_limit_max_exclusive(eb, qg_limit),
+		(long long)btrfs_qgroup_limit_rsv_referenced(eb, qg_limit),
+		(long long)btrfs_qgroup_limit_rsv_exclusive(eb, qg_limit));
+}
+
+static void print_persistent_item(struct extent_buffer *eb, void *ptr,
+		u32 item_size, u64 objectid, u64 offset)
+{
+	printf("\t\tpersistent item objectid ");
+	print_objectid(stdout, objectid, BTRFS_PERSISTENT_ITEM_KEY);
+	printf(" offset %llu\n", (unsigned long long)offset);
+	switch (objectid) {
+	case BTRFS_DEV_STATS_OBJECTID:
+		print_dev_stats(eb, ptr, item_size);
+		break;
+	default:
+		printf("\t\tunknown persistent item objectid %llu\n", objectid);
+	}
+}
+
+static void print_temporary_item(struct extent_buffer *eb, void *ptr,
+		u64 objectid, u64 offset)
+{
+	printf("\t\ttemporary item objectid ");
+	print_objectid(stdout, objectid, BTRFS_TEMPORARY_ITEM_KEY);
+	printf(" offset %llu\n", (unsigned long long)offset);
+	switch (objectid) {
+	case BTRFS_BALANCE_OBJECTID:
+		print_balance_item(eb, ptr);
+		break;
+	default:
+		printf("\t\tunknown temporary item objectid %llu\n", objectid);
+	}
+}
+
+static void print_extent_csum(struct extent_buffer *eb,
+		struct btrfs_fs_info *fs_info, u32 item_size, u64 start)
+{
+	u32 size;
+
+	size = (item_size / btrfs_super_csum_size(fs_info->super_copy)) *
+			fs_info->sectorsize;
+	printf("\t\trange start %llu end %llu length %u\n",
+			(unsigned long long)start,
+			(unsigned long long)start + size, size);
+}
+
 /* Caller must ensure sizeof(*ret) >= 14 "WRITTEN|RELOC" */
 static void header_flags_to_str(u64 flags, char *ret)
 {
@@ -1003,9 +1172,6 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 		u64 objectid;
 		u32 type;
 		u64 offset;
-		char flags_str[256];
-		char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
-		u8 uuid[BTRFS_UUID_SIZE];
 
 		item = btrfs_item_nr(i);
 		item_size = btrfs_item_size(eb, item);
@@ -1054,7 +1220,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 			printf("\t\torphan item\n");
 			break;
 		case BTRFS_ROOT_ITEM_KEY:
-			print_root(eb, i);
+			print_root_item(eb, i);
 			break;
 		case BTRFS_ROOT_REF_KEY:
 			print_root_ref(eb, i, "ref");
@@ -1074,25 +1240,12 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 		case BTRFS_SHARED_BLOCK_REF_KEY:
 			printf("\t\tshared block backref\n");
 			break;
-		case BTRFS_EXTENT_DATA_REF_KEY: {
-			struct btrfs_extent_data_ref *dref;
-
-			dref = btrfs_item_ptr(eb, i, struct btrfs_extent_data_ref);
-			printf("\t\textent data backref root %llu "
-			       "objectid %llu offset %llu count %u\n",
-			       (unsigned long long)btrfs_extent_data_ref_root(eb, dref),
-			       (unsigned long long)btrfs_extent_data_ref_objectid(eb, dref),
-			       (unsigned long long)btrfs_extent_data_ref_offset(eb, dref),
-			       btrfs_extent_data_ref_count(eb, dref));
+		case BTRFS_EXTENT_DATA_REF_KEY:
+			print_extent_data_ref(eb, i);
 			break;
-			}
-		case BTRFS_SHARED_DATA_REF_KEY: {
-			struct btrfs_shared_data_ref *sref;
-			sref = btrfs_item_ptr(eb, i, struct btrfs_shared_data_ref);
-			printf("\t\tshared data backref count %u\n",
-			       btrfs_shared_data_ref_count(eb, sref));
+		case BTRFS_SHARED_DATA_REF_KEY:
+			print_shared_data_ref(eb, i);
 			break;
-			}
 		case BTRFS_EXTENT_REF_V0_KEY:
 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
 			print_extent_ref_v0(eb, i);
@@ -1104,34 +1257,18 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 			printf("\t\tcsum item\n");
 			break;
 		case BTRFS_EXTENT_CSUM_KEY:
-			printf("\t\textent csum item\n");
+			print_extent_csum(eb, root->fs_info, item_size,
+					offset);
 			break;
 		case BTRFS_EXTENT_DATA_KEY:
 			print_file_extent_item(eb, item, i, ptr);
 			break;
-		case BTRFS_BLOCK_GROUP_ITEM_KEY: {
-			struct btrfs_block_group_item bg_item;
-
-			read_extent_buffer(eb, &bg_item, (unsigned long)ptr,
-					   sizeof(bg_item));
-			memset(flags_str, 0, sizeof(flags_str));
-			bg_flags_to_str(btrfs_block_group_flags(&bg_item),
-					flags_str);
-			printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
-			       (unsigned long long)btrfs_block_group_used(&bg_item),
-			       (unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
-			       flags_str);
+		case BTRFS_BLOCK_GROUP_ITEM_KEY:
+			print_block_group_item(eb, ptr);
 			break;
-			}
-		case BTRFS_FREE_SPACE_INFO_KEY: {
-			struct btrfs_free_space_info *free_info;
-
-			free_info = btrfs_item_ptr(eb, i, struct btrfs_free_space_info);
-			printf("\t\tfree space info extent count %u flags %u\n",
-			       (unsigned)btrfs_free_space_extent_count(eb, free_info),
-			       (unsigned)btrfs_free_space_flags(eb, free_info));
+		case BTRFS_FREE_SPACE_INFO_KEY:
+			print_free_space_info(eb, i);
 			break;
-			}
 		case BTRFS_FREE_SPACE_EXTENT_KEY:
 			printf("\t\tfree space extent\n");
 			break;
@@ -1139,98 +1276,25 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 			printf("\t\tfree space bitmap\n");
 			break;
 		case BTRFS_CHUNK_ITEM_KEY:
-			print_chunk(eb, ptr);
+			print_chunk_item(eb, ptr);
 			break;
 		case BTRFS_DEV_ITEM_KEY:
 			print_dev_item(eb, ptr);
 			break;
-		case BTRFS_DEV_EXTENT_KEY: {
-			struct btrfs_dev_extent *dev_extent;
-
-			dev_extent = btrfs_item_ptr(eb, i,
-						    struct btrfs_dev_extent);
-			read_extent_buffer(eb, uuid,
-				(unsigned long)btrfs_dev_extent_chunk_tree_uuid(dev_extent),
-				BTRFS_UUID_SIZE);
-			uuid_unparse(uuid, uuid_str);
-			printf("\t\tdev extent chunk_tree %llu\n"
-			       "\t\tchunk_objectid %llu chunk_offset %llu "
-			       "length %llu\n"
-			       "\t\tchunk_tree_uuid %s\n",
-			       (unsigned long long)
-			       btrfs_dev_extent_chunk_tree(eb, dev_extent),
-			       (unsigned long long)
-			       btrfs_dev_extent_chunk_objectid(eb, dev_extent),
-			       (unsigned long long)
-			       btrfs_dev_extent_chunk_offset(eb, dev_extent),
-			       (unsigned long long)
-			       btrfs_dev_extent_length(eb, dev_extent),
-			       uuid_str);
+		case BTRFS_DEV_EXTENT_KEY:
+			print_dev_extent(eb, i);
 			break;
-			}
-		case BTRFS_QGROUP_STATUS_KEY: {
-			struct btrfs_qgroup_status_item *qg_status;
-
-			qg_status = btrfs_item_ptr(eb, i,
-					struct btrfs_qgroup_status_item);
-			memset(flags_str, 0, sizeof(flags_str));
-			qgroup_flags_to_str(btrfs_qgroup_status_flags(eb, qg_status),
-					flags_str);
-			printf("\t\tversion %llu generation %llu flags %s "
-				"scan %lld\n",
-				(unsigned long long)
-				btrfs_qgroup_status_version(eb, qg_status),
-				(unsigned long long)
-				btrfs_qgroup_status_generation(eb, qg_status),
-				flags_str,
-				(unsigned long long)
-				btrfs_qgroup_status_rescan(eb, qg_status));
+		case BTRFS_QGROUP_STATUS_KEY:
+			print_qgroup_status(eb, i);
 			break;
-			}
 		case BTRFS_QGROUP_RELATION_KEY:
 			break;
-		case BTRFS_QGROUP_INFO_KEY: {
-			struct btrfs_qgroup_info_item *qg_info;
-
-			qg_info = btrfs_item_ptr(eb, i,
-						 struct btrfs_qgroup_info_item);
-			printf("\t\tgeneration %llu\n"
-			     "\t\treferenced %llu referenced_compressed %llu\n"
-			     "\t\texclusive %llu exclusive_compressed %llu\n",
-			       (unsigned long long)
-			       btrfs_qgroup_info_generation(eb, qg_info),
-			       (unsigned long long)
-			       btrfs_qgroup_info_referenced(eb, qg_info),
-			       (unsigned long long)
-			       btrfs_qgroup_info_referenced_compressed(eb,
-								       qg_info),
-			       (unsigned long long)
-			       btrfs_qgroup_info_exclusive(eb, qg_info),
-			       (unsigned long long)
-			       btrfs_qgroup_info_exclusive_compressed(eb,
-								      qg_info));
+		case BTRFS_QGROUP_INFO_KEY:
+			print_qgroup_info(eb, i);
 			break;
-			}
-		case BTRFS_QGROUP_LIMIT_KEY: {
-			struct btrfs_qgroup_limit_item *qg_limit;
-
-			qg_limit = btrfs_item_ptr(eb, i,
-					 struct btrfs_qgroup_limit_item);
-			printf("\t\tflags %llx\n"
-			     "\t\tmax_referenced %lld max_exclusive %lld\n"
-			     "\t\trsv_referenced %lld rsv_exclusive %lld\n",
-			       (unsigned long long)
-			       btrfs_qgroup_limit_flags(eb, qg_limit),
-			       (long long)
-			       btrfs_qgroup_limit_max_referenced(eb, qg_limit),
-			       (long long)
-			       btrfs_qgroup_limit_max_exclusive(eb, qg_limit),
-			       (long long)
-			       btrfs_qgroup_limit_rsv_referenced(eb, qg_limit),
-			       (long long)
-			       btrfs_qgroup_limit_rsv_exclusive(eb, qg_limit));
+		case BTRFS_QGROUP_LIMIT_KEY:
+			print_qgroup_limit(eb, i);
 			break;
-			}
 		case BTRFS_UUID_KEY_SUBVOL:
 		case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
 			print_uuid_item(eb, btrfs_item_ptr_offset(eb, i),
@@ -1243,30 +1307,11 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
 			break;
 			}
 		case BTRFS_PERSISTENT_ITEM_KEY:
-			printf("\t\tpersistent item objectid ");
-			print_objectid(stdout, objectid, BTRFS_PERSISTENT_ITEM_KEY);
-			printf(" offset %llu\n", (unsigned long long)offset);
-			switch (objectid) {
-			case BTRFS_DEV_STATS_OBJECTID:
-				print_dev_stats(eb, ptr, item_size);
-				break;
-			default:
-				printf("\t\tunknown persistent item objectid %llu\n",
-						objectid);
-			}
+			print_persistent_item(eb, ptr, item_size, objectid,
+					offset);
 			break;
 		case BTRFS_TEMPORARY_ITEM_KEY:
-			printf("\t\ttemporary item objectid ");
-			print_objectid(stdout, objectid, BTRFS_TEMPORARY_ITEM_KEY);
-			printf(" offset %llu\n", (unsigned long long)offset);
-			switch (objectid) {
-			case BTRFS_BALANCE_OBJECTID:
-				print_balance_item(eb, ptr);
-				break;
-			default:
-				printf("\t\tunknown temporary item objectid %llu\n",
-						objectid);
-			}
+			print_temporary_item(eb, ptr, objectid, offset);
 			break;
 		};
 		fflush(stdout);
@@ -1277,7 +1322,6 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
 {
 	u32 i;
 	u32 nr;
-	u32 size;
 	struct btrfs_disk_key disk_key;
 	struct btrfs_key key;
 	struct extent_buffer *next;
@@ -1297,7 +1341,6 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
 		(unsigned long long)btrfs_header_owner(eb));
 	print_uuids(eb);
 	fflush(stdout);
-	size = root->fs_info->nodesize;
 	for (i = 0; i < nr; i++) {
 		u64 blocknr = btrfs_node_blockptr(eb, i);
 		btrfs_node_key(eb, &disk_key, i);
@@ -1306,7 +1349,7 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
 		btrfs_print_key(&disk_key);
 		printf(" block %llu (%llu) gen %llu\n",
 		       (unsigned long long)blocknr,
-		       (unsigned long long)blocknr / size,
+		       (unsigned long long)blocknr / root->fs_info->nodesize,
 		       (unsigned long long)btrfs_node_ptr_generation(eb, i));
 		fflush(stdout);
 	}
@@ -1315,7 +1358,7 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
 
 	for (i = 0; i < nr; i++) {
 		next = read_tree_block(root->fs_info,
-				btrfs_node_blockptr(eb, i), size,
+				btrfs_node_blockptr(eb, i),
 				btrfs_node_ptr_generation(eb, i));
 		if (!extent_buffer_uptodate(next)) {
 			fprintf(stderr, "failed to read %llu in tree %llu\n",