diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-04-24 12:07:39 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@hera.kernel.org> | 2007-04-24 12:07:39 -0400 |
commit | c62a1920ced752e86f57ab1d4ad0ec65012bce4d (patch) | |
tree | 39ae2aa95a7921d2b0a959ccb28a3f3733154c47 /fs/btrfs/ctree.h | |
parent | b51338628f604d9b4ed3c776839a484a30e12fb7 (diff) |
Btrfs: get rid of the extent_item type field
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 78248d577290..2d166ca8b104 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -152,9 +152,6 @@ struct btrfs_path { | |||
152 | int slots[BTRFS_MAX_LEVEL]; | 152 | int slots[BTRFS_MAX_LEVEL]; |
153 | }; | 153 | }; |
154 | 154 | ||
155 | /* values for the type field in btrfs_extent_item */ | ||
156 | #define BTRFS_EXTENT_TREE 1 | ||
157 | #define BTRFS_EXTENT_FILE 2 | ||
158 | /* | 155 | /* |
159 | * items in the extent btree are used to record the objectid of the | 156 | * items in the extent btree are used to record the objectid of the |
160 | * owner of the block and the number of references | 157 | * owner of the block and the number of references |
@@ -162,7 +159,6 @@ struct btrfs_path { | |||
162 | struct btrfs_extent_item { | 159 | struct btrfs_extent_item { |
163 | __le32 refs; | 160 | __le32 refs; |
164 | __le64 owner; | 161 | __le64 owner; |
165 | u8 type; | ||
166 | } __attribute__ ((__packed__)); | 162 | } __attribute__ ((__packed__)); |
167 | 163 | ||
168 | struct btrfs_inode_timespec { | 164 | struct btrfs_inode_timespec { |
@@ -489,16 +485,6 @@ static inline void btrfs_set_extent_owner(struct btrfs_extent_item *ei, u64 val) | |||
489 | ei->owner = cpu_to_le64(val); | 485 | ei->owner = cpu_to_le64(val); |
490 | } | 486 | } |
491 | 487 | ||
492 | static inline u8 btrfs_extent_type(struct btrfs_extent_item *ei) | ||
493 | { | ||
494 | return ei->type; | ||
495 | } | ||
496 | |||
497 | static inline void btrfs_set_extent_type(struct btrfs_extent_item *ei, u8 val) | ||
498 | { | ||
499 | ei->type = val; | ||
500 | } | ||
501 | |||
502 | static inline u64 btrfs_node_blockptr(struct btrfs_node *n, int nr) | 488 | static inline u64 btrfs_node_blockptr(struct btrfs_node *n, int nr) |
503 | { | 489 | { |
504 | return le64_to_cpu(n->ptrs[nr].blockptr); | 490 | return le64_to_cpu(n->ptrs[nr].blockptr); |
@@ -1036,7 +1022,7 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, | |||
1036 | struct btrfs_root *root); | 1022 | struct btrfs_root *root); |
1037 | int btrfs_alloc_extent(struct btrfs_trans_handle *trans, | 1023 | int btrfs_alloc_extent(struct btrfs_trans_handle *trans, |
1038 | struct btrfs_root *root, u64 owner, | 1024 | struct btrfs_root *root, u64 owner, |
1039 | u8 type, u64 num_blocks, u64 search_start, | 1025 | u64 num_blocks, u64 search_start, |
1040 | u64 search_end, struct btrfs_key *ins); | 1026 | u64 search_end, struct btrfs_key *ins); |
1041 | int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, | 1027 | int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, |
1042 | struct buffer_head *buf); | 1028 | struct buffer_head *buf); |