Skip to content

L
linux
Commit 9a8dd150 authored by Chris Mason's avatar Chris Mason Committed by David Woodhouse
Browse files
Options

Btrfs: Block sized tree extents and extent deletion 

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 5c680ed6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 252 additions and 135 deletions
fs/btrfs/ctree.c
View file @ 9a8dd150
This diff is collapsed.
fs/btrfs/ctree.h
View file @ 9a8dd150
...@@ -28,21 +28,12 @@ struct header { ...@@ -28,21 +28,12 @@ struct header {
struct tree_buffer; struct tree_buffer;
struct alloc_extent {
u64 blocknr;
u64 num_blocks;
u64 num_used;
} __attribute__ ((__packed__));
struct ctree_root { struct ctree_root {
struct tree_buffer *node; struct tree_buffer *node;
struct ctree_root *extent_root; struct ctree_root *extent_root;
struct alloc_extent *alloc_extent; struct key current_insert;
struct alloc_extent *reserve_extent;
int fp; int fp;
struct radix_tree_root cache_radix; struct radix_tree_root cache_radix;
struct alloc_extent ai1;
struct alloc_extent ai2;
}; };
struct ctree_root_info { struct ctree_root_info {
...@@ -52,8 +43,6 @@ struct ctree_root_info { ...@@ -52,8 +43,6 @@ struct ctree_root_info {
u64 tree_root; /* the tree root */ u64 tree_root; /* the tree root */
u32 csum; u32 csum;
u32 ham; u32 ham;
struct alloc_extent alloc_extent;
struct alloc_extent reserve_extent;
u64 snapuuid[2]; /* root specific uuid */ u64 snapuuid[2]; /* root specific uuid */
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
......
fs/btrfs/disk-io.c
View file @ 9a8dd150
...@@ -12,33 +12,13 @@ ...@@ -12,33 +12,13 @@
static int allocated_blocks = 0; static int allocated_blocks = 0;
static int get_free_block(struct ctree_root *root, u64 *block) static int check_tree_block(struct ctree_root *root, struct tree_buffer *buf)
{ {
struct stat st; if (buf->blocknr != buf->node.header.blocknr)
int ret = 0; BUG();
if (root->node && buf->node.header.parentid != root->node->node.header.parentid)
if (root->alloc_extent->num_used >= root->alloc_extent->num_blocks) BUG();
return -1; return 0;
*block = root->alloc_extent->blocknr + root->alloc_extent->num_used;
root->alloc_extent->num_used += 1;
if (root->alloc_extent->num_used >= root->alloc_extent->num_blocks) {
struct alloc_extent *ae = root->alloc_extent;
root->alloc_extent = root->reserve_extent;
root->reserve_extent = ae;
ae->num_blocks = 0;
}
st.st_size = 0;
ret = fstat(root->fp, &st);
if (st.st_size < (*block + 1) * CTREE_BLOCKSIZE) {
ret = ftruncate(root->fp,
(*block + 1) * CTREE_BLOCKSIZE);
if (ret) {
perror("ftruncate");
exit(1);
}
}
return ret;
} }
struct tree_buffer *alloc_tree_block(struct ctree_root *root, u64 blocknr) struct tree_buffer *alloc_tree_block(struct ctree_root *root, u64 blocknr)
...@@ -61,22 +41,23 @@ struct tree_buffer *alloc_tree_block(struct ctree_root *root, u64 blocknr) ...@@ -61,22 +41,23 @@ struct tree_buffer *alloc_tree_block(struct ctree_root *root, u64 blocknr)
return buf; return buf;
} }
struct tree_buffer *alloc_free_block(struct ctree_root *root) struct tree_buffer *find_tree_block(struct ctree_root *root, u64 blocknr)
{ {
u64 free_block; struct tree_buffer *buf;
int ret; buf = radix_tree_lookup(&root->cache_radix, blocknr);
struct tree_buffer * buf; if (buf) {
ret = get_free_block(root, &free_block); buf->count++;
if (ret) { } else {
buf = alloc_tree_block(root, blocknr);
if (!buf) {
BUG(); BUG();
return NULL; return NULL;
} }
buf = alloc_tree_block(root, free_block); }
if (!buf)
BUG();
return buf; return buf;
} }
struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr) struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr)
{ {
loff_t offset = blocknr * CTREE_BLOCKSIZE; loff_t offset = blocknr * CTREE_BLOCKSIZE;
...@@ -86,8 +67,7 @@ struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr) ...@@ -86,8 +67,7 @@ struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr)
buf = radix_tree_lookup(&root->cache_radix, blocknr); buf = radix_tree_lookup(&root->cache_radix, blocknr);
if (buf) { if (buf) {
buf->count++; buf->count++;
goto test; } else {
}
buf = alloc_tree_block(root, blocknr); buf = alloc_tree_block(root, blocknr);
if (!buf) if (!buf)
return NULL; return NULL;
...@@ -96,10 +76,8 @@ struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr) ...@@ -96,10 +76,8 @@ struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr)
free(buf); free(buf);
return NULL; return NULL;
} }
test: }
if (buf->blocknr != buf->node.header.blocknr) if (check_tree_block(root, buf))
BUG();
if (root->node && buf->node.header.parentid != root->node->node.header.parentid)
BUG(); BUG();
return buf; return buf;
} }
...@@ -121,17 +99,10 @@ int write_tree_block(struct ctree_root *root, struct tree_buffer *buf) ...@@ -121,17 +99,10 @@ int write_tree_block(struct ctree_root *root, struct tree_buffer *buf)
static int __setup_root(struct ctree_root *root, struct ctree_root *extent_root, static int __setup_root(struct ctree_root *root, struct ctree_root *extent_root,
struct ctree_root_info *info, int fp) struct ctree_root_info *info, int fp)
{ {
INIT_RADIX_TREE(&root->cache_radix, GFP_KERNEL);
root->fp = fp; root->fp = fp;
root->node = NULL; root->node = NULL;
root->node = read_tree_block(root, info->tree_root); root->node = read_tree_block(root, info->tree_root);
root->extent_root = extent_root; root->extent_root = extent_root;
memcpy(&root->ai1, &info->alloc_extent, sizeof(info->alloc_extent));
memcpy(&root->ai2, &info->reserve_extent, sizeof(info->reserve_extent));
root->alloc_extent = &root->ai1;
root->reserve_extent = &root->ai2;
printf("setup done reading root %p, used %lu available %lu\n", root, root->alloc_extent->num_used, root->alloc_extent->num_blocks);
printf("setup done reading root %p, reserve used %lu available %lu\n", root, root->reserve_extent->num_used, root->reserve_extent->num_blocks);
return 0; return 0;
} }
...@@ -147,6 +118,8 @@ struct ctree_root *open_ctree(char *filename, struct ctree_super_block *super) ...@@ -147,6 +118,8 @@ struct ctree_root *open_ctree(char *filename, struct ctree_super_block *super)
free(root); free(root);
return NULL; return NULL;
} }
INIT_RADIX_TREE(&root->cache_radix, GFP_KERNEL);
INIT_RADIX_TREE(&extent_root->cache_radix, GFP_KERNEL);
ret = pread(fp, super, sizeof(struct ctree_super_block), ret = pread(fp, super, sizeof(struct ctree_super_block),
CTREE_SUPER_INFO_OFFSET(CTREE_BLOCKSIZE)); CTREE_SUPER_INFO_OFFSET(CTREE_BLOCKSIZE));
if (ret == 0 || super->root_info.tree_root == 0) { if (ret == 0 || super->root_info.tree_root == 0) {
...@@ -168,8 +141,6 @@ struct ctree_root *open_ctree(char *filename, struct ctree_super_block *super) ...@@ -168,8 +141,6 @@ struct ctree_root *open_ctree(char *filename, struct ctree_super_block *super)
static int __update_root(struct ctree_root *root, struct ctree_root_info *info) static int __update_root(struct ctree_root *root, struct ctree_root_info *info)
{ {
info->tree_root = root->node->blocknr; info->tree_root = root->node->blocknr;
memcpy(&info->alloc_extent, root->alloc_extent, sizeof(struct alloc_extent));
memcpy(&info->reserve_extent, root->reserve_extent, sizeof(struct alloc_extent));
return 0; return 0;
} }
...@@ -201,6 +172,7 @@ int close_ctree(struct ctree_root *root) ...@@ -201,6 +172,7 @@ int close_ctree(struct ctree_root *root)
void tree_block_release(struct ctree_root *root, struct tree_buffer *buf) void tree_block_release(struct ctree_root *root, struct tree_buffer *buf)
{ {
buf->count--; buf->count--;
write_tree_block(root, buf);
if (buf->count < 0) if (buf->count < 0)
BUG(); BUG();
if (buf->count == 0) { if (buf->count == 0) {
......
fs/btrfs/disk-io.h
View file @ 9a8dd150
...@@ -11,11 +11,11 @@ struct tree_buffer { ...@@ -11,11 +11,11 @@ struct tree_buffer {
}; };
struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr); struct tree_buffer *read_tree_block(struct ctree_root *root, u64 blocknr);
struct tree_buffer *find_tree_block(struct ctree_root *root, u64 blocknr);
int write_tree_block(struct ctree_root *root, struct tree_buffer *buf); int write_tree_block(struct ctree_root *root, struct tree_buffer *buf);
struct ctree_root *open_ctree(char *filename, struct ctree_super_block *s); struct ctree_root *open_ctree(char *filename, struct ctree_super_block *s);
int close_ctree(struct ctree_root *root); int close_ctree(struct ctree_root *root);
void tree_block_release(struct ctree_root *root, struct tree_buffer *buf); void tree_block_release(struct ctree_root *root, struct tree_buffer *buf);
struct tree_buffer *alloc_free_block(struct ctree_root *root);
int write_ctree_super(struct ctree_root *root, struct ctree_super_block *s); int write_ctree_super(struct ctree_root *root, struct ctree_super_block *s);
int mkfs(int fd); int mkfs(int fd);
......
fs/btrfs/mkfs.c
View file @ 9a8dd150
...@@ -23,17 +23,10 @@ int mkfs(int fd) ...@@ -23,17 +23,10 @@ int mkfs(int fd)
info[0].blocknr = 16; info[0].blocknr = 16;
info[0].objectid = 1; info[0].objectid = 1;
info[0].tree_root = 17; info[0].tree_root = 17;
info[0].alloc_extent.blocknr = 0;
info[0].alloc_extent.num_blocks = 64;
/* 0-17 are used (inclusive) */
info[0].alloc_extent.num_used = 18;
info[1].blocknr = 16; info[1].blocknr = 16;
info[1].objectid = 2; info[1].objectid = 2;
info[1].tree_root = 64; info[1].tree_root = 18;
info[1].alloc_extent.blocknr = 64;
info[1].alloc_extent.num_blocks = 64;
info[1].alloc_extent.num_used = 1;
ret = pwrite(fd, info, sizeof(info), ret = pwrite(fd, info, sizeof(info),
CTREE_SUPER_INFO_OFFSET(CTREE_BLOCKSIZE)); CTREE_SUPER_INFO_OFFSET(CTREE_BLOCKSIZE));
if (ret != sizeof(info)) if (ret != sizeof(info))
...@@ -48,24 +41,36 @@ int mkfs(int fd) ...@@ -48,24 +41,36 @@ int mkfs(int fd)
return -1; return -1;
empty_leaf.header.parentid = 2; empty_leaf.header.parentid = 2;
empty_leaf.header.blocknr = 64; empty_leaf.header.blocknr = 18;
empty_leaf.header.nritems = 2; empty_leaf.header.nritems = 3;
/* item1, reserve blocks 0-16 */
item.key.objectid = 0; item.key.objectid = 0;
item.key.offset = 64; item.key.offset = 17;
item.key.flags = 0; item.key.flags = 0;
item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item); item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item);
item.size = sizeof(struct extent_item); item.size = sizeof(struct extent_item);
extent_item.refs = 1; extent_item.refs = 1;
extent_item.owner = 1; extent_item.owner = 0;
memcpy(empty_leaf.items, &item, sizeof(item)); memcpy(empty_leaf.items, &item, sizeof(item));
memcpy(empty_leaf.data + item.offset, &extent_item, item.size); memcpy(empty_leaf.data + item.offset, &extent_item, item.size);
item.key.objectid = 64;
item.key.offset = 64; /* item2, give block 17 to the root */
item.key.objectid = 17;
item.key.offset = 1;
item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item) * 2; item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item) * 2;
extent_item.owner = 2; extent_item.owner = 1;
memcpy(empty_leaf.items + 1, &item, sizeof(item)); memcpy(empty_leaf.items + 1, &item, sizeof(item));
memcpy(empty_leaf.data + item.offset, &extent_item, item.size); memcpy(empty_leaf.data + item.offset, &extent_item, item.size);
ret = pwrite(fd, &empty_leaf, sizeof(empty_leaf), 64 * CTREE_BLOCKSIZE);
/* item3, give block 18 for the extent root */
item.key.objectid = 18;
item.key.offset = 1;
item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item) * 3;
extent_item.owner = 2;
memcpy(empty_leaf.items + 2, &item, sizeof(item));
memcpy(empty_leaf.data + item.offset, &extent_item, item.size);
ret = pwrite(fd, &empty_leaf, sizeof(empty_leaf), 18 * CTREE_BLOCKSIZE);
if (ret != sizeof(empty_leaf)) if (ret != sizeof(empty_leaf))
return -1; return -1;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7