Skip to contentSkip to conversation

btrfs: Take num_copies out of loop for btree_read_extent_buffer_pages()

PATCH In review Miao Xie 3 participants 3 messages Mar 25, 2010 – Mar 31, 2010 Btrfs file system

lore
Share & tools
lore

Miao Xie

author
#0 lore raw

PATCH 5/18 btrfs: Take num_copies out of loop for btree_read_extent_buffer_pages()

From: Zhao Lei <[email protected]>

num_copies's value is not changed in this function, and it is not necessary to calculate its value multi-times.

---
 fs/btrfs/disk-io.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/disk-io.c +2 -3
index 11d0ad3..79d9196 100644
@@ -301,7 +301,8 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 {
 	struct extent_io_tree *io_tree;
 	int ret;
-	int num_copies = 0;
+	int num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
+					  eb->start, eb->len);
 	int mirror_num = 0;
 
 	io_tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree;
@@ -312,8 +313,6 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 		    !verify_parent_transid(io_tree, eb, parent_transid))
 			return ret;
 
-		num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
-					      eb->start, eb->len);
 		if (num_copies == 1)
 			return ret;
 
Signature · 1 line
1.6.5.2
#1 lore raw
Quoted 4 lines · Miao Xie

From: Zhao Lei <[email protected]>

num_copies's value is not changed in this function, and it is not necessary to calculate its value multi-times.

It is true that we don't need to calculate this multiple times, but with the existing code the calculation is only done when there is an IO error.

We could use a check for num_copies == 0 before calling the calc function.

-chris

Quoted 38 lines
---
 fs/btrfs/disk-io.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/disk-io.c +2 -3
index 11d0ad3..79d9196 100644
@@ -301,7 +301,8 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 {
 	struct extent_io_tree *io_tree;
 	int ret;
-	int num_copies = 0;
+	int num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
+					  eb->start, eb->len);
 	int mirror_num = 0;
 
 	io_tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree;
@@ -312,8 +313,6 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 		    !verify_parent_transid(io_tree, eb, parent_transid))
 			return ret;
 
-		num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
-					      eb->start, eb->len);
 		if (num_copies == 1)
 			return ret;
 
Signature · 7 lines
1.6.5.2


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 6 lines · Chris Mason
Quoted 4 lines · Miao Xie

From: Zhao Lei <[email protected]>

num_copies's value is not changed in this function, and it is not necessary to calculate its value multi-times.

Quoted 8 lines

It is true that we don't need to calculate this multiple times, but with the existing code the calculation is only done when there is an IO error.

We could use a check for num_copies == 0 before calling the calc function.

-chris

Hello, chris

I'll modify this patch to read num_copies only in IO error.

Thanks
Zhaolei

Quoted 42 lines
Quoted 37 lines
---
 fs/btrfs/disk-io.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/disk-io.c +2 -3
index 11d0ad3..79d9196 100644
@@ -301,7 +301,8 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 {
 	struct extent_io_tree *io_tree;
 	int ret;
-	int num_copies = 0;
+	int num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
+					  eb->start, eb->len);
 	int mirror_num = 0;
 
 	io_tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree;
@@ -312,8 +313,6 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 		    !verify_parent_transid(io_tree, eb, parent_transid))
 			return ret;
 
-		num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
-					      eb->start, eb->len);
 		if (num_copies == 1)
 			return ret;
 
Signature · 7 lines
1.6.5.2


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html