marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of the extent_item type field

master
Chris Mason 2007-04-24 12:09:01 -04:00 committed by David Woodhouse
parent 885f275a68
commit 10d06538f1
5 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
btrfsck.c
View File

@ -19,7 +19,6 @@ struct extent_record {
u64 owner;
u32 refs;
u32 extent_item_refs;
u8 type;
};
static int check_node(struct btrfs_root *root,
@ -113,7 +112,7 @@ static int check_block(struct btrfs_root *root,
static int add_extent_rec(struct radix_tree_root *extent_radix,
struct btrfs_disk_key *parent_key,
u64 ref, u64 start, u64 nr, u64 owner, u8 type,
u64 ref, u64 start, u64 nr, u64 owner,
u32 extent_item_refs, int inc_ref)
{
struct extent_record *rec;
@ -132,11 +131,6 @@ static int add_extent_rec(struct radix_tree_root *extent_radix,
rec->start, start);
ret = 1;
}
if (type != rec->type) {
fprintf(stderr, "type mismatch block %Lu %d %d\n",
start, type, rec->type);
ret = 1;
}
if (extent_item_refs)
rec->extent_item_refs = extent_item_refs;
return ret;
@ -147,7 +141,6 @@ static int add_extent_rec(struct radix_tree_root *extent_radix,
rec->start = start;
rec->nr = nr;
rec->owner = owner;
rec->type = type;
if (inc_ref)
rec->refs = 1;
@ -263,7 +256,6 @@ static int run_next_block(struct btrfs_root *root,
found.objectid,
found.offset,
btrfs_extent_owner(ei),
btrfs_extent_type(ei),
btrfs_extent_refs(ei), 0);
continue;
}
@ -279,7 +271,7 @@ static int run_next_block(struct btrfs_root *root,
btrfs_file_extent_disk_blocknr(fi),
btrfs_file_extent_disk_num_blocks(fi),
btrfs_disk_key_objectid(&leaf->items[i].key),
BTRFS_EXTENT_FILE, 0, 1);
0, 1);
BUG_ON(ret);
}
} else {
@ -292,7 +284,7 @@ static int run_next_block(struct btrfs_root *root,
&node->ptrs[i].key,
blocknr, ptr, 1,
btrfs_header_owner(&node->header),
BTRFS_EXTENT_TREE, 0, 1);
0, 1);
BUG_ON(ret);
if (level > 1) {
add_pending(nodes, seen, ptr);
@ -316,8 +308,7 @@ static int add_root_to_pending(struct btrfs_root *root,
{
add_pending(pending, seen, root->node->blocknr);
add_extent_rec(extent_radix, NULL, 0, root->node->blocknr, 1,
btrfs_header_owner(&root->node->node.header),
BTRFS_EXTENT_TREE, 0, 1);
btrfs_header_owner(&root->node->node.header), 0, 1);
return 0;
}

14
ctree.h
View File

@ -145,9 +145,6 @@ struct btrfs_path {
int slots[BTRFS_MAX_LEVEL];
};
/* values for the type field in btrfs_extent_item */
#define BTRFS_EXTENT_TREE 1
#define BTRFS_EXTENT_FILE 2
/*
* items in the extent btree are used to record the objectid of the
* owner of the block and the number of references
@ -155,7 +152,6 @@ struct btrfs_path {
struct btrfs_extent_item {
__le32 refs;
__le64 owner;
u8 type;
} __attribute__ ((__packed__));
struct btrfs_inode_timespec {
@ -477,16 +473,6 @@ static inline void btrfs_set_extent_owner(struct btrfs_extent_item *ei, u64 val)
ei->owner = cpu_to_le64(val);
}
static inline u8 btrfs_extent_type(struct btrfs_extent_item *ei)
{
return ei->type;
}
static inline void btrfs_set_extent_type(struct btrfs_extent_item *ei, u8 val)
{
ei->type = val;
}
static inline u64 btrfs_node_blockptr(struct btrfs_node *n, int nr)
{
return le64_to_cpu(n->ptrs[nr].blockptr);

6
extent-tree.c
View File

@ -138,7 +138,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, struct
struct btrfs_fs_info *info = extent_root->fs_info;
btrfs_set_extent_refs(&extent_item, 1);
btrfs_set_extent_type(&extent_item, BTRFS_EXTENT_TREE);
btrfs_set_extent_owner(&extent_item, extent_root->root_key.objectid);
ins.offset = 1;
ins.flags = 0;
@ -396,7 +395,7 @@ error:
* returns 0 if everything worked, non-zero otherwise.
*/
static int alloc_extent(struct btrfs_trans_handle *trans, struct btrfs_root
*root, u64 owner, u8 type, u64 num_blocks,
*root, u64 owner, u64 num_blocks,
u64 search_start, u64
search_end, struct btrfs_key *ins)
{
@ -409,7 +408,6 @@ static int alloc_extent(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_extent_refs(&extent_item, 1);
btrfs_set_extent_owner(&extent_item, owner);
btrfs_set_extent_type(&extent_item, type);
if (root == extent_root) {
BUG_ON(extent_root->fs_info->current_insert.offset == 0);
@ -453,7 +451,7 @@ struct btrfs_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
struct btrfs_buffer *buf;
ret = alloc_extent(trans, root, root->root_key.objectid,
BTRFS_EXTENT_TREE, 1, 0, (unsigned long)-1, &ins);
1, 0, (unsigned long)-1, &ins);
if (ret) {
BUG();
return NULL;

1
mkfs.c
View File

@ -216,7 +216,6 @@ int mkfs(int fd, char *pathname, u64 num_blocks, u32 blocksize)
btrfs_set_item_size(&item, sizeof(struct btrfs_extent_item));
btrfs_set_extent_refs(&extent_item, 1);
btrfs_set_extent_owner(&extent_item, BTRFS_ROOT_TREE_OBJECTID);
btrfs_set_extent_type(&extent_item, BTRFS_EXTENT_TREE);
memcpy(empty_leaf->items, &item, sizeof(item));
memcpy(btrfs_leaf_data(empty_leaf) + btrfs_item_offset(&item),
&extent_item, btrfs_item_size(&item));

3
print-tree.c
View File

@ -85,9 +85,8 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
break;
case BTRFS_EXTENT_ITEM_KEY:
ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);
printf("\t\textent data refs %u type %d owner %Lu\n",
printf("\t\textent data refs %u owner %Lu\n",
btrfs_extent_refs(ei),
btrfs_extent_type(ei),
btrfs_extent_owner(ei));
break;
case BTRFS_CSUM_ITEM_KEY: