diff options
| author | David Sterba <dsterba@suse.cz> | 2011-10-24 14:47:58 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-10-24 14:47:58 +0200 |
| commit | a81d3b1ba2f5faae28ba7a092c7598673fa02ac2 (patch) | |
| tree | 8301fefcd9f3d45be9d0030456a86bca5b9ff061 /fs/btrfs/ctree.c | |
| parent | afd582ac8f10382002a72b4d17d9c2db328ed8b8 (diff) | |
| parent | f9d9ef62cd3ecbd6cbb7957a253c1e81f69d5586 (diff) | |
Merge branch 'hotfixes-20111024/josef/for-chris' into btrfs-next-stable
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 011cab3aca8..0fe615e4ea3 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -902,9 +902,10 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, orig_ptr = btrfs_node_blockptr(mid, orig_slot); - if (level < BTRFS_MAX_LEVEL - 1) + if (level < BTRFS_MAX_LEVEL - 1) { parent = path->nodes[level + 1]; - pslot = path->slots[level + 1]; + pslot = path->slots[level + 1]; + } /* * deal with the case where there is only one pointer in the root @@ -1107,9 +1108,10 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans, mid = path->nodes[level]; WARN_ON(btrfs_header_generation(mid) != trans->transid); - if (level < BTRFS_MAX_LEVEL - 1) + if (level < BTRFS_MAX_LEVEL - 1) { parent = path->nodes[level + 1]; - pslot = path->slots[level + 1]; + pslot = path->slots[level + 1]; + } if (!parent) return 1; |