From: Qu Wenruo <quwenruo@cn.fujitsu.com>
Date: Thu, 18 May 2017 01:29:54 +0000 (+0800)
Subject: btrfs-progs: Refactor nodesize users in image/main.c
X-Git-Tag: upstream/4.16.1~613
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3816fd1ee134f4bdb226e5ff9f0f2221dbef3c3a;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: Refactor nodesize users in image/main.c

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---

diff --git a/image/main.c b/image/main.c
index 1eca414..33b5614 100644
--- a/image/main.c
+++ b/image/main.c
@@ -919,7 +919,7 @@ static int flush_pending(struct metadump_struct *md, int done)
 {
 	struct async_work *async = NULL;
 	struct extent_buffer *eb;
-	u64 blocksize = md->root->nodesize;
+	u64 blocksize = md->root->fs_info->nodesize;
 	u64 start = 0;
 	u64 size;
 	size_t offset;
@@ -1083,7 +1083,8 @@ static int copy_tree_blocks(struct btrfs_root *root, struct extent_buffer *eb,
 	int i = 0;
 	int ret;
 
-	ret = add_extent(btrfs_header_bytenr(eb), root->nodesize, metadump, 0);
+	ret = add_extent(btrfs_header_bytenr(eb), root->fs_info->nodesize,
+			 metadump, 0);
 	if (ret) {
 		error("unable to add metadata block %llu: %d",
 				btrfs_header_bytenr(eb), ret);
@@ -1102,7 +1103,8 @@ static int copy_tree_blocks(struct btrfs_root *root, struct extent_buffer *eb,
 				continue;
 			ri = btrfs_item_ptr(eb, i, struct btrfs_root_item);
 			bytenr = btrfs_disk_root_bytenr(eb, ri);
-			tmp = read_tree_block(root, bytenr, root->nodesize, 0);
+			tmp = read_tree_block(root, bytenr,
+					      root->fs_info->nodesize, 0);
 			if (!extent_buffer_uptodate(tmp)) {
 				error("unable to read log root block");
 				return -EIO;
@@ -1113,7 +1115,8 @@ static int copy_tree_blocks(struct btrfs_root *root, struct extent_buffer *eb,
 				return ret;
 		} else {
 			bytenr = btrfs_node_blockptr(eb, i);
-			tmp = read_tree_block(root, bytenr, root->nodesize, 0);
+			tmp = read_tree_block(root, bytenr,
+					      root->fs_info->nodesize, 0);
 			if (!extent_buffer_uptodate(tmp)) {
 				error("unable to read log root block");
 				return -EIO;
@@ -1260,7 +1263,7 @@ static int copy_from_extent_tree(struct metadump_struct *metadump,
 
 		bytenr = key.objectid;
 		if (key.type == BTRFS_METADATA_ITEM_KEY) {
-			num_bytes = extent_root->nodesize;
+			num_bytes = extent_root->fs_info->nodesize;
 		} else {
 			num_bytes = key.offset;
 		}