mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
Btrfs: Large block related defrag optimizations
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
19c00ddcc3
commit
0f1ebbd159
2 changed files with 23 additions and 4 deletions
|
@ -217,11 +217,9 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
|
||||||
root->fs_info->generation);
|
root->fs_info->generation);
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
}
|
}
|
||||||
if (btrfs_buffer_defrag_done(parent))
|
parent_level = btrfs_header_level(parent);
|
||||||
return 0;
|
|
||||||
|
|
||||||
parent_nritems = btrfs_header_nritems(parent);
|
parent_nritems = btrfs_header_nritems(parent);
|
||||||
parent_level = btrfs_header_level(parent);
|
|
||||||
blocksize = btrfs_level_size(root, parent_level - 1);
|
blocksize = btrfs_level_size(root, parent_level - 1);
|
||||||
|
|
||||||
start_slot = 0;
|
start_slot = 0;
|
||||||
|
|
|
@ -118,7 +118,6 @@ static int defrag_walk_down(struct btrfs_trans_handle *trans,
|
||||||
WARN_ON(*level >= BTRFS_MAX_LEVEL);
|
WARN_ON(*level >= BTRFS_MAX_LEVEL);
|
||||||
|
|
||||||
btrfs_clear_buffer_defrag(path->nodes[*level]);
|
btrfs_clear_buffer_defrag(path->nodes[*level]);
|
||||||
btrfs_clear_buffer_defrag_done(path->nodes[*level]);
|
|
||||||
|
|
||||||
free_extent_buffer(path->nodes[*level]);
|
free_extent_buffer(path->nodes[*level]);
|
||||||
path->nodes[*level] = NULL;
|
path->nodes[*level] = NULL;
|
||||||
|
@ -148,6 +147,26 @@ static int defrag_walk_up(struct btrfs_trans_handle *trans,
|
||||||
root->defrag_level = i;
|
root->defrag_level = i;
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
|
if (*level > 1 && path->nodes[*level] != root->node) {
|
||||||
|
struct extent_buffer *next;
|
||||||
|
u64 last;
|
||||||
|
int ret;
|
||||||
|
ret = btrfs_cow_block(trans, root,
|
||||||
|
path->nodes[*level],
|
||||||
|
path->nodes[*level + 1],
|
||||||
|
path->slots[*level + 1],
|
||||||
|
&next);
|
||||||
|
BUG_ON(ret);
|
||||||
|
path->nodes[*level] = next;
|
||||||
|
last = next->start;
|
||||||
|
ret = btrfs_realloc_node(trans, root, next,
|
||||||
|
cache_only, &last);
|
||||||
|
BUG_ON(ret);
|
||||||
|
|
||||||
|
if (root == root->fs_info->extent_root)
|
||||||
|
btrfs_extent_post_op(trans, root);
|
||||||
|
}
|
||||||
|
|
||||||
btrfs_clear_buffer_defrag(path->nodes[*level]);
|
btrfs_clear_buffer_defrag(path->nodes[*level]);
|
||||||
btrfs_clear_buffer_defrag_done(path->nodes[*level]);
|
btrfs_clear_buffer_defrag_done(path->nodes[*level]);
|
||||||
free_extent_buffer(path->nodes[*level]);
|
free_extent_buffer(path->nodes[*level]);
|
||||||
|
@ -183,9 +202,11 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
|
||||||
|
|
||||||
level = btrfs_header_level(root->node);
|
level = btrfs_header_level(root->node);
|
||||||
orig_level = level;
|
orig_level = level;
|
||||||
|
|
||||||
if (level == 0) {
|
if (level == 0) {
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (root->defrag_progress.objectid == 0) {
|
if (root->defrag_progress.objectid == 0) {
|
||||||
extent_buffer_get(root->node);
|
extent_buffer_get(root->node);
|
||||||
ret = btrfs_cow_block(trans, root, root->node, NULL, 0, &tmp);
|
ret = btrfs_cow_block(trans, root, root->node, NULL, 0, &tmp);
|
||||||
|
|
Loading…
Reference in a new issue