lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: Defrag: only walk into nodes with the defrag bit set

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2007-10-15 16:22:11 -04:00
parent 304fced668
commit cf786e79e3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/btrfs/ctree.c
View File

@@ -280,7 +280,6 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
*last_ret = search_start; *last_ret = search_start;
if (parent_level == 1) if (parent_level == 1)
btrfs_clear_buffer_defrag(tmp); btrfs_clear_buffer_defrag(tmp);
btrfs_set_buffer_defrag_done(tmp);
free_extent_buffer(tmp); free_extent_buffer(tmp);
} }
return err; return err;

8
fs/btrfs/tree-defrag.c
View File

@@ -87,8 +87,8 @@ static int defrag_walk_down(struct btrfs_trans_handle *trans,
if (cache_only) { if (cache_only) {
next = btrfs_find_tree_block(root, bytenr, next = btrfs_find_tree_block(root, bytenr,
btrfs_level_size(root, *level - 1)); btrfs_level_size(root, *level - 1));
/* FIXME, test for defrag */ if (!next || !btrfs_buffer_uptodate(next) ||
if (!next || !btrfs_buffer_uptodate(next)) { !btrfs_buffer_defrag(next)) {
free_extent_buffer(next); free_extent_buffer(next);
path->slots[*level]++; path->slots[*level]++;
continue; continue;
@@ -147,7 +147,8 @@ 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) { if (*level > 1 && path->nodes[*level] != root->node &&
btrfs_buffer_defrag(path->nodes[*level])) {
struct extent_buffer *next; struct extent_buffer *next;
u64 last; u64 last;
int ret; int ret;
@@ -168,7 +169,6 @@ static int defrag_walk_up(struct btrfs_trans_handle *trans,
} }
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;
*level = i + 1; *level = i + 1;