summaryrefslogtreecommitdiff
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-12-11 12:42:00 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:58 -0400
commitd8d5f3e16d1ae4fe9b93312e083f2c04a95520f0 (patch)
tree3327d76311a31a9345a3019534bb043ff14d204f /fs/btrfs/inode.c
parent7bb86316c3961d1bc401ef184fd996f999556c7f (diff)
downloadlwn-d8d5f3e16d1ae4fe9b93312e083f2c04a95520f0.tar.gz
lwn-d8d5f3e16d1ae4fe9b93312e083f2c04a95520f0.zip
Btrfs: Add lowest key information to back refs for extent tree blocks as well.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index bb70db0c9df4..03fea037667e 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -563,6 +563,7 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
u64 extent_num_bytes = 0;
u64 item_end = 0;
u64 root_gen = 0;
+ u64 root_owner = 0;
int found_extent;
int del_item;
int extent_type = -1;
@@ -673,15 +674,8 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
found_extent = 1;
inode->i_blocks -= num_dec;
}
- if (leaf == root->node) {
- root_gen =
- btrfs_header_generation(leaf);
- } else {
- struct extent_buffer *parent;
- parent = path->nodes[1];
- root_gen =
- btrfs_header_generation(parent);
- }
+ root_gen = btrfs_header_generation(leaf);
+ root_owner = btrfs_header_owner(leaf);
}
} else if (extent_type == BTRFS_FILE_EXTENT_INLINE &&
!del_item) {
@@ -703,7 +697,7 @@ delete:
if (found_extent) {
ret = btrfs_free_extent(trans, root, extent_start,
extent_num_bytes,
- root->root_key.objectid,
+ root_owner,
root_gen, inode->i_ino,
found_key.offset, 0);
BUG_ON(ret);