diff options
author | Yan Zheng <zheng.yan@oracle.com> | 2008-10-09 11:46:24 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-10-09 11:46:24 -0400 |
commit | 3bb1a1bc42f2ae9582c28adf620484efcd4da38d (patch) | |
tree | 4e65ee859e73ea9558e33a02ba10e1d9d54756f3 /fs/btrfs/inode.c | |
parent | a76a3cd40c1127ca199d4f7f37bf0d541bf44eb2 (diff) |
Btrfs: Remove offset field from struct btrfs_extent_ref
The offset field in struct btrfs_extent_ref records the position
inside file that file extent is referenced by. In the new back
reference system, tree leaves holding references to file extent
are recorded explicitly. We can scan these tree leaves very quickly, so the
offset field is not required.
This patch also makes the back reference system check the objectid
when extents are in deleting.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f9df89c5fdfc..3ab147dc3c05 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -647,8 +647,7 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) | |||
647 | ins.type = BTRFS_EXTENT_ITEM_KEY; | 647 | ins.type = BTRFS_EXTENT_ITEM_KEY; |
648 | ret = btrfs_alloc_reserved_extent(trans, root, leaf->start, | 648 | ret = btrfs_alloc_reserved_extent(trans, root, leaf->start, |
649 | root->root_key.objectid, | 649 | root->root_key.objectid, |
650 | trans->transid, inode->i_ino, | 650 | trans->transid, inode->i_ino, &ins); |
651 | ordered_extent->file_offset, &ins); | ||
652 | BUG_ON(ret); | 651 | BUG_ON(ret); |
653 | btrfs_release_path(root, path); | 652 | btrfs_release_path(root, path); |
654 | 653 | ||
@@ -1734,8 +1733,7 @@ delete: | |||
1734 | ret = btrfs_free_extent(trans, root, extent_start, | 1733 | ret = btrfs_free_extent(trans, root, extent_start, |
1735 | extent_num_bytes, | 1734 | extent_num_bytes, |
1736 | leaf->start, root_owner, | 1735 | leaf->start, root_owner, |
1737 | root_gen, inode->i_ino, | 1736 | root_gen, inode->i_ino, 0); |
1738 | found_key.offset, 0); | ||
1739 | BUG_ON(ret); | 1737 | BUG_ON(ret); |
1740 | } | 1738 | } |
1741 | next: | 1739 | next: |