redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

btrfs: remove blocksize from btrfs_alloc_free_block and rename

Browse source 
Rename to btrfs_alloc_tree_block as it fits to the alloc/find/free +
_tree_block family. The parameter blocksize was set to the metadata
block size, directly or indirectly.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2014-06-15 01:54:12 +02:00
parent 0308af4465
commit 4d75f8a9c8
5 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/btrfs/ctree.c
View file

@ -258,9 +258,8 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
else else
btrfs_node_key(buf, &disk_key, 0); btrfs_node_key(buf, &disk_key, 0);
cow = btrfs_alloc_free_block(trans, root, buf->len, 0, cow = btrfs_alloc_tree_block(trans, root, 0, new_root_objectid,
new_root_objectid, &disk_key, level, &disk_key, level, buf->start, 0);
buf->start, 0);
if (IS_ERR(cow)) if (IS_ERR(cow))
return PTR_ERR(cow); return PTR_ERR(cow);
@ -1133,9 +1132,9 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
} else } else
parent_start = 0; parent_start = 0;
cow = btrfs_alloc_free_block(trans, root, buf->len, parent_start, cow = btrfs_alloc_tree_block(trans, root, parent_start,
root->root_key.objectid, &disk_key, root->root_key.objectid, &disk_key, level,
level, search_start, empty_size); search_start, empty_size);
if (IS_ERR(cow)) if (IS_ERR(cow))
return PTR_ERR(cow); return PTR_ERR(cow);
@ -3355,9 +3354,8 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
else else
btrfs_node_key(lower, &lower_key, 0); btrfs_node_key(lower, &lower_key, 0);
c = btrfs_alloc_free_block(trans, root, root->nodesize, 0, c = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
root->root_key.objectid, &lower_key, &lower_key, level, root->node->start, 0);
level, root->node->start, 0);
if (IS_ERR(c)) if (IS_ERR(c))
return PTR_ERR(c); return PTR_ERR(c);
@ -3495,9 +3493,8 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
mid = (c_nritems + 1) / 2; mid = (c_nritems + 1) / 2;
btrfs_node_key(c, &disk_key, mid); btrfs_node_key(c, &disk_key, mid);
split = btrfs_alloc_free_block(trans, root, root->nodesize, 0, split = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
root->root_key.objectid, &disk_key, level, c->start, 0);
&disk_key, level, c->start, 0);
if (IS_ERR(split)) if (IS_ERR(split))
return PTR_ERR(split); return PTR_ERR(split);
@ -4275,9 +4272,8 @@ again:
else else
btrfs_item_key(l, &disk_key, mid); btrfs_item_key(l, &disk_key, mid);
right = btrfs_alloc_free_block(trans, root, root->nodesize, 0, right = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
root->root_key.objectid, &disk_key, 0, l->start, 0);
&disk_key, 0, l->start, 0);
if (IS_ERR(right)) if (IS_ERR(right))
return PTR_ERR(right); return PTR_ERR(right);

6
fs/btrfs/ctree.h
View file

@ -3290,9 +3290,9 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group(
u64 bytenr); u64 bytenr);
void btrfs_put_block_group(struct btrfs_block_group_cache *cache); void btrfs_put_block_group(struct btrfs_block_group_cache *cache);
int get_block_group_index(struct btrfs_block_group_cache *cache); int get_block_group_index(struct btrfs_block_group_cache *cache);
struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u32 blocksize, struct btrfs_root *root, u64 parent,
u64 parent, u64 root_objectid, u64 root_objectid,
struct btrfs_disk_key *key, int level, struct btrfs_disk_key *key, int level,
u64 hint, u64 empty_size); u64 hint, u64 empty_size);
void btrfs_free_tree_block(struct btrfs_trans_handle *trans, void btrfs_free_tree_block(struct btrfs_trans_handle *trans,

8
fs/btrfs/disk-io.c
View file

@ -1324,8 +1324,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
root->root_key.type = BTRFS_ROOT_ITEM_KEY; root->root_key.type = BTRFS_ROOT_ITEM_KEY;
root->root_key.offset = 0; root->root_key.offset = 0;
leaf = btrfs_alloc_free_block(trans, root, root->nodesize, leaf = btrfs_alloc_tree_block(trans, root, 0, objectid, NULL, 0, 0, 0);
0, objectid, NULL, 0, 0, 0);
if (IS_ERR(leaf)) { if (IS_ERR(leaf)) {
ret = PTR_ERR(leaf); ret = PTR_ERR(leaf);
leaf = NULL; leaf = NULL;
@ -1412,9 +1411,8 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,
* updated (along with back refs to the log tree). * updated (along with back refs to the log tree).
*/ */
leaf = btrfs_alloc_free_block(trans, root, root->nodesize, 0, leaf = btrfs_alloc_tree_block(trans, root, 0, BTRFS_TREE_LOG_OBJECTID,
BTRFS_TREE_LOG_OBJECTID, NULL, NULL, 0, 0, 0);
0, 0, 0);
if (IS_ERR(leaf)) { if (IS_ERR(leaf)) {
kfree(root); kfree(root);
return ERR_CAST(leaf); return ERR_CAST(leaf);

5
fs/btrfs/extent-tree.c
View file

@ -7322,8 +7322,8 @@ static void unuse_block_rsv(struct btrfs_fs_info *fs_info,
* *
* returns the tree buffer or NULL. * returns the tree buffer or NULL.
*/ */
struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u32 blocksize, struct btrfs_root *root,
u64 parent, u64 root_objectid, u64 parent, u64 root_objectid,
struct btrfs_disk_key *key, int level, struct btrfs_disk_key *key, int level,
u64 hint, u64 empty_size) u64 hint, u64 empty_size)
@ -7333,6 +7333,7 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
struct extent_buffer *buf; struct extent_buffer *buf;
u64 flags = 0; u64 flags = 0;
int ret; int ret;
u32 blocksize = root->nodesize;
bool skinny_metadata = btrfs_fs_incompat(root->fs_info, bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
SKINNY_METADATA); SKINNY_METADATA);

3
fs/btrfs/ioctl.c
View file

@ -480,8 +480,7 @@ static noinline int create_subvol(struct inode *dir,
if (ret) if (ret)
goto fail; goto fail;
leaf = btrfs_alloc_free_block(trans, root, root->nodesize, leaf = btrfs_alloc_tree_block(trans, root, 0, objectid, NULL, 0, 0, 0);
0, objectid, NULL, 0, 0, 0);
if (IS_ERR(leaf)) { if (IS_ERR(leaf)) {
ret = PTR_ERR(leaf); ret = PTR_ERR(leaf);
goto fail; goto fail;