Gitweb:     http://git.kernel.org/linus/8c594ea81d7abbbffdda447b127f8ba8d76f319d
Commit:     8c594ea81d7abbbffdda447b127f8ba8d76f319d
Parent:     11c8349b4eb68f2b04cd8ece577377e6c0e5dd4b
Author:     Chris Mason <chris.mason@oracle.com>
AuthorDate: Mon Apr 20 15:50:10 2009 -0400
Committer:  Chris Mason <chris.mason@oracle.com>
CommitDate: Mon Apr 20 15:53:09 2009 -0400

    Btrfs: use the right node in reada_for_balance
    
    reada_for_balance was using the wrong index into the path node array,
    so it wasn't reading the right blocks.  We never directly used the
    results of the read done by this function because the btree search is
    started over at the end.
    
    This fixes reada_for_balance to reada in the correct node and to
    avoid searching past the last slot in the node.  It also makes sure to
    hold the parent lock while we are finding the nodes to read.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
---
 fs/btrfs/ctree.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index e5b2533..a99f1c2 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1325,12 +1325,12 @@ static noinline int reada_for_balance(struct btrfs_root *root,
 	int ret = 0;
 	int blocksize;
 
-	parent = path->nodes[level - 1];
+	parent = path->nodes[level + 1];
 	if (!parent)
 		return 0;
 
 	nritems = btrfs_header_nritems(parent);
-	slot = path->slots[level];
+	slot = path->slots[level + 1];
 	blocksize = btrfs_level_size(root, level);
 
 	if (slot > 0) {
@@ -1341,7 +1341,7 @@ static noinline int reada_for_balance(struct btrfs_root *root,
 			block1 = 0;
 		free_extent_buffer(eb);
 	}
-	if (slot < nritems) {
+	if (slot + 1 < nritems) {
 		block2 = btrfs_node_blockptr(parent, slot + 1);
 		gen = btrfs_node_ptr_generation(parent, slot + 1);
 		eb = btrfs_find_tree_block(root, block2, blocksize);
@@ -1351,7 +1351,11 @@ static noinline int reada_for_balance(struct btrfs_root ...
[ message continues ]