From fc390539d6a7dd5419dd61bd63558be9741b863d Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Thu, 13 Dec 2007 09:48:07 -0500 Subject: [PATCH] --- yaml --- r: 128567 b: refs/heads/master c: 6caab489c5866788ae64a72986520b1f0e40c706 h: refs/heads/master i: 128565: a739f3fe1225a176ce589208735a090bac4c5a82 128563: e183eca536d82fd553210d1f876bbfc8a1dc8be2 128559: 9adb72d8ff415205591b4afaa0b56aee26c51f79 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e47184ffee8e..908f647cd64c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a7205367dfd9adf129f0ebc7d040a557fe0d1ba +refs/heads/master: 6caab489c5866788ae64a72986520b1f0e40c706 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index 7c953b2ecf15..057cdd49c09b 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -702,7 +702,7 @@ int btrfs_inc_root_ref(struct btrfs_trans_handle *trans, } return btrfs_inc_extent_ref(trans, root, root->node->start, root->node->len, owner_objectid, - generation, 0, 0); + generation, key_objectid, level); } int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, @@ -746,10 +746,12 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, } } else { bytenr = btrfs_node_blockptr(buf, i); + btrfs_node_key_to_cpu(buf, &key, i); ret = btrfs_inc_extent_ref(trans, root, bytenr, btrfs_level_size(root, level - 1), root->root_key.objectid, - trans->transid, 0, 0); + trans->transid, key.objectid, + level - 1); if (ret) { faili = i; goto fail;