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

btrfs-progs: Remove fs_info parameter from btrfs_leaf_free_space() 

For btrfs_leaf_free_space(), to get leaf data size, we have two way to
get it:

1) leaf->fs_info->nodesize
2) leaf->len

Anyway, we could get rid of @fs_info parameter for
btrfs_leaf_free_space().
And here we choose method 2), as it provides extra benefit to get leaf
free space without initializing a real fs_info.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Qu Wenruo 2018-04-30 11:15:43 +08:00 committed by David Sterba
parent eb7b42003a
commit 41750fe660
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
btrfs-corrupt-block.c
View File

@ -726,7 +726,7 @@ out:
static void shift_items(struct btrfs_root *root, struct extent_buffer *eb) static void shift_items(struct btrfs_root *root, struct extent_buffer *eb)
{ {
int nritems = btrfs_header_nritems(eb); int nritems = btrfs_header_nritems(eb);
int shift_space = btrfs_leaf_free_space(root->fs_info, eb) / 2; int shift_space = btrfs_leaf_free_space(eb) / 2;
int slot = nritems / 2; int slot = nritems / 2;
int i = 0; int i = 0;
unsigned int data_end = btrfs_item_offset_nr(eb, nritems - 1); unsigned int data_end = btrfs_item_offset_nr(eb, nritems - 1);

2
check/main.c
View File

@ -5988,7 +5988,7 @@ static int run_next_block(struct btrfs_root *root,
goto out; goto out;
if (btrfs_is_leaf(buf)) { if (btrfs_is_leaf(buf)) {
btree_space_waste += btrfs_leaf_free_space(fs_info, buf); btree_space_waste += btrfs_leaf_free_space(buf);
for (i = 0; i < nritems; i++) { for (i = 0; i < nritems; i++) {
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;

2
check/mode-lowmem.c
View File

@ -730,7 +730,7 @@ static void account_bytes(struct btrfs_root *root, struct btrfs_path *path,
total_extent_tree_bytes += eb->len; total_extent_tree_bytes += eb->len;
if (level == 0) { if (level == 0) {
btree_space_waste += btrfs_leaf_free_space(root->fs_info, eb); btree_space_waste += btrfs_leaf_free_space(eb);
} else { } else {
free_nrs = (BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - free_nrs = (BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) -
btrfs_header_nritems(eb)); btrfs_header_nritems(eb));

49
ctree.c
View File

@ -480,11 +480,11 @@ btrfs_check_leaf(struct btrfs_root *root, struct btrfs_disk_key *parent_key,
(unsigned long long)btrfs_header_bytenr(buf)); (unsigned long long)btrfs_header_bytenr(buf));
goto fail; goto fail;
} }
if (btrfs_leaf_free_space(root->fs_info, buf) < 0) { if (btrfs_leaf_free_space(buf) < 0) {
ret = BTRFS_TREE_BLOCK_INVALID_FREE_SPACE; ret = BTRFS_TREE_BLOCK_INVALID_FREE_SPACE;
fprintf(stderr, "leaf free space incorrect %llu %d\n", fprintf(stderr, "leaf free space incorrect %llu %d\n",
(unsigned long long)btrfs_header_bytenr(buf), (unsigned long long)btrfs_header_bytenr(buf),
btrfs_leaf_free_space(root->fs_info, buf)); btrfs_leaf_free_space(buf));
goto fail; goto fail;
} }
@ -1193,7 +1193,7 @@ again:
} else { } else {
p->slots[level] = slot; p->slots[level] = slot;
if (ins_len > 0 && if (ins_len > 0 &&
ins_len > btrfs_leaf_free_space(root->fs_info, b)) { ins_len > btrfs_leaf_free_space(b)) {
int sret = split_leaf(trans, root, key, int sret = split_leaf(trans, root, key,
p, ins_len, ret == 0); p, ins_len, ret == 0);
BUG_ON(sret > 0); BUG_ON(sret > 0);
@ -1634,17 +1634,19 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr)
* the start of the leaf data. IOW, how much room * the start of the leaf data. IOW, how much room
* the leaf has left for both items and data * the leaf has left for both items and data
*/ */
int btrfs_leaf_free_space(struct btrfs_fs_info *fs_info, int btrfs_leaf_free_space(struct extent_buffer *leaf)
struct extent_buffer *leaf)
{ {
int nritems = btrfs_header_nritems(leaf); int nritems = btrfs_header_nritems(leaf);
u32 leaf_data_size;
int ret; int ret;
ret = BTRFS_LEAF_DATA_SIZE(fs_info) - leaf_space_used(leaf, 0, nritems); BUG_ON(leaf->fs_info && leaf->fs_info->nodesize != leaf->len);
leaf_data_size = __BTRFS_LEAF_DATA_SIZE(leaf->len);
ret = leaf_data_size - leaf_space_used(leaf, 0 ,nritems);
if (ret < 0) { if (ret < 0) {
printk("leaf free space ret %d, leaf data size %lu, used %d nritems %d\n", printk("leaf free space ret %d, leaf data size %u, used %d nritems %d\n",
ret, BTRFS_LEAF_DATA_SIZE(fs_info), ret, leaf_data_size, leaf_space_used(leaf, 0, nritems),
leaf_space_used(leaf, 0, nritems), nritems); nritems);
} }
return ret; return ret;
} }
@ -1692,7 +1694,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
return PTR_ERR(right); return PTR_ERR(right);
return -EIO; return -EIO;
} }
free_space = btrfs_leaf_free_space(fs_info, right); free_space = btrfs_leaf_free_space(right);
if (free_space < data_size) { if (free_space < data_size) {
free_extent_buffer(right); free_extent_buffer(right);
return 1; return 1;
@ -1705,7 +1707,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
free_extent_buffer(right); free_extent_buffer(right);
return 1; return 1;
} }
free_space = btrfs_leaf_free_space(fs_info, right); free_space = btrfs_leaf_free_space(right);
if (free_space < data_size) { if (free_space < data_size) {
free_extent_buffer(right); free_extent_buffer(right);
return 1; return 1;
@ -1844,7 +1846,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
} }
left = read_node_slot(fs_info, path->nodes[1], slot - 1); left = read_node_slot(fs_info, path->nodes[1], slot - 1);
free_space = btrfs_leaf_free_space(fs_info, left); free_space = btrfs_leaf_free_space(left);
if (free_space < data_size) { if (free_space < data_size) {
free_extent_buffer(left); free_extent_buffer(left);
return 1; return 1;
@ -1859,7 +1861,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
return 1; return 1;
} }
free_space = btrfs_leaf_free_space(fs_info, left); free_space = btrfs_leaf_free_space(left);
if (free_space < data_size) { if (free_space < data_size) {
free_extent_buffer(left); free_extent_buffer(left);
return 1; return 1;
@ -2083,7 +2085,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
l = path->nodes[0]; l = path->nodes[0];
/* did the pushes work? */ /* did the pushes work? */
if (btrfs_leaf_free_space(root->fs_info, l) >= data_size) if (btrfs_leaf_free_space(l) >= data_size)
return 0; return 0;
} }
@ -2240,7 +2242,7 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,
leaf = path->nodes[0]; leaf = path->nodes[0];
btrfs_item_key_to_cpu(leaf, &orig_key, path->slots[0]); btrfs_item_key_to_cpu(leaf, &orig_key, path->slots[0]);
if (btrfs_leaf_free_space(root->fs_info, leaf) >= if (btrfs_leaf_free_space(leaf) >=
sizeof(struct btrfs_item)) sizeof(struct btrfs_item))
goto split; goto split;
@ -2261,8 +2263,7 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,
ret = split_leaf(trans, root, &orig_key, path, 0, 0); ret = split_leaf(trans, root, &orig_key, path, 0, 0);
BUG_ON(ret); BUG_ON(ret);
BUG_ON(btrfs_leaf_free_space(root->fs_info, leaf) < BUG_ON(btrfs_leaf_free_space(leaf) < sizeof(struct btrfs_item));
sizeof(struct btrfs_item));
leaf = path->nodes[0]; leaf = path->nodes[0];
split: split:
@ -2314,7 +2315,7 @@ split:
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
ret = 0; ret = 0;
if (btrfs_leaf_free_space(root->fs_info, leaf) < 0) { if (btrfs_leaf_free_space(leaf) < 0) {
btrfs_print_leaf(leaf); btrfs_print_leaf(leaf);
BUG(); BUG();
} }
@ -2410,7 +2411,7 @@ int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
ret = 0; ret = 0;
if (btrfs_leaf_free_space(root->fs_info, leaf) < 0) { if (btrfs_leaf_free_space(leaf) < 0) {
btrfs_print_leaf(leaf); btrfs_print_leaf(leaf);
BUG(); BUG();
} }
@ -2435,7 +2436,7 @@ int btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
nritems = btrfs_header_nritems(leaf); nritems = btrfs_header_nritems(leaf);
data_end = leaf_data_end(root->fs_info, leaf); data_end = leaf_data_end(root->fs_info, leaf);
if (btrfs_leaf_free_space(root->fs_info, leaf) < data_size) { if (btrfs_leaf_free_space(leaf) < data_size) {
btrfs_print_leaf(leaf); btrfs_print_leaf(leaf);
BUG(); BUG();
} }
@ -2472,7 +2473,7 @@ int btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
ret = 0; ret = 0;
if (btrfs_leaf_free_space(root->fs_info, leaf) < 0) { if (btrfs_leaf_free_space(leaf) < 0) {
btrfs_print_leaf(leaf); btrfs_print_leaf(leaf);
BUG(); BUG();
} }
@ -2521,10 +2522,10 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
nritems = btrfs_header_nritems(leaf); nritems = btrfs_header_nritems(leaf);
data_end = leaf_data_end(root->fs_info, leaf); data_end = leaf_data_end(root->fs_info, leaf);
if (btrfs_leaf_free_space(root->fs_info, leaf) < total_size) { if (btrfs_leaf_free_space(leaf) < total_size) {
btrfs_print_leaf(leaf); btrfs_print_leaf(leaf);
printk("not enough freespace need %u have %d\n", printk("not enough freespace need %u have %d\n",
total_size, btrfs_leaf_free_space(root->fs_info, leaf)); total_size, btrfs_leaf_free_space(leaf));
BUG(); BUG();
} }
@ -2582,7 +2583,7 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
btrfs_fixup_low_keys(root, path, &disk_key, 1); btrfs_fixup_low_keys(root, path, &disk_key, 1);
} }
if (btrfs_leaf_free_space(root->fs_info, leaf) < 0) { if (btrfs_leaf_free_space(leaf) < 0) {
btrfs_print_leaf(leaf); btrfs_print_leaf(leaf);
BUG(); BUG();
} }

3
ctree.h
View File

@ -2664,8 +2664,7 @@ static inline int btrfs_next_item(struct btrfs_root *root,
} }
int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path); int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path);
int btrfs_leaf_free_space(struct btrfs_fs_info *fs_info, int btrfs_leaf_free_space(struct extent_buffer *leaf);
struct extent_buffer *leaf);
void btrfs_fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path, void btrfs_fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path,
struct btrfs_disk_key *key, int level); struct btrfs_disk_key *key, int level);
int btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path, int btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,

2
print-tree.c
View File

@ -1192,7 +1192,7 @@ void btrfs_print_leaf(struct extent_buffer *eb)
printf("leaf %llu items %d free space %d generation %llu owner ", printf("leaf %llu items %d free space %d generation %llu owner ",
(unsigned long long)btrfs_header_bytenr(eb), nr, (unsigned long long)btrfs_header_bytenr(eb), nr,
btrfs_leaf_free_space(fs_info, eb), btrfs_leaf_free_space(eb),
(unsigned long long)btrfs_header_generation(eb)); (unsigned long long)btrfs_header_generation(eb));
print_objectid(stdout, btrfs_header_owner(eb), 0); print_objectid(stdout, btrfs_header_owner(eb), 0);
printf("\n"); printf("\n");