Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 128567
b: refs/heads/master
c: 6caab48
h: refs/heads/master
i:
  128565: a739f3f
  128563: e183eca
  128559: 9adb72d
v: v3
  • Loading branch information
Chris Mason committed Sep 25, 2008
1 parent f01cabf commit fc39053
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7a7205367dfd9adf129f0ebc7d040a557fe0d1ba
refs/heads/master: 6caab489c5866788ae64a72986520b1f0e40c706
6 changes: 4 additions & 2 deletions trunk/fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit fc39053

Please sign in to comment.