aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-04-24 12:07:39 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-04-24 12:07:39 -0400
commitc62a1920ced752e86f57ab1d4ad0ec65012bce4d (patch)
tree39ae2aa95a7921d2b0a959ccb28a3f3733154c47 /fs/btrfs/extent-tree.c
parentb51338628f604d9b4ed3c776839a484a30e12fb7 (diff)
Btrfs: get rid of the extent_item type field
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index aac3eccffb8..116519503d0 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -167,7 +167,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, struct
167 ins.offset = 1; 167 ins.offset = 1;
168 ins.flags = 0; 168 ins.flags = 0;
169 btrfs_set_key_type(&ins, BTRFS_EXTENT_ITEM_KEY); 169 btrfs_set_key_type(&ins, BTRFS_EXTENT_ITEM_KEY);
170 btrfs_set_extent_type(&extent_item, BTRFS_EXTENT_TREE);
171 btrfs_set_extent_owner(&extent_item, extent_root->root_key.objectid); 170 btrfs_set_extent_owner(&extent_item, extent_root->root_key.objectid);
172 171
173 for (i = 0; i < extent_root->fs_info->current_insert.flags; i++) { 172 for (i = 0; i < extent_root->fs_info->current_insert.flags; i++) {
@@ -464,7 +463,7 @@ error:
464 */ 463 */
465int btrfs_alloc_extent(struct btrfs_trans_handle *trans, 464int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
466 struct btrfs_root *root, u64 owner, 465 struct btrfs_root *root, u64 owner,
467 u8 type, u64 num_blocks, u64 search_start, 466 u64 num_blocks, u64 search_start,
468 u64 search_end, struct btrfs_key *ins) 467 u64 search_end, struct btrfs_key *ins)
469{ 468{
470 int ret; 469 int ret;
@@ -476,7 +475,6 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
476 475
477 btrfs_set_extent_refs(&extent_item, 1); 476 btrfs_set_extent_refs(&extent_item, 1);
478 btrfs_set_extent_owner(&extent_item, owner); 477 btrfs_set_extent_owner(&extent_item, owner);
479 btrfs_set_extent_type(&extent_item, type);
480 478
481 if (root == extent_root) { 479 if (root == extent_root) {
482 BUG_ON(extent_root->fs_info->current_insert.offset == 0); 480 BUG_ON(extent_root->fs_info->current_insert.offset == 0);
@@ -520,7 +518,6 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
520 struct buffer_head *buf; 518 struct buffer_head *buf;
521 519
522 ret = btrfs_alloc_extent(trans, root, root->root_key.objectid, 520 ret = btrfs_alloc_extent(trans, root, root->root_key.objectid,
523 BTRFS_EXTENT_TREE,
524 1, 0, (unsigned long)-1, &ins); 521 1, 0, (unsigned long)-1, &ins);
525 if (ret) { 522 if (ret) {
526 BUG(); 523 BUG();