diff options
| author | Chris Mason <clm@fb.com> | 2014-10-04 09:57:14 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-04 09:57:14 -0700 |
| commit | 27b19cc8864e206c4203041892b0f706f044a0f1 (patch) | |
| tree | f724dd77efa379da881fba7f46075af17a728bf9 /fs/btrfs/ctree.h | |
| parent | bbf65cf0b5b67843ca094df01019222b85af2183 (diff) | |
| parent | 4d75f8a9c87b843c8ded15b82b8d137b9724cccc (diff) | |
| download | op-kernel-dev-27b19cc8864e206c4203041892b0f706f044a0f1.zip op-kernel-dev-27b19cc8864e206c4203041892b0f706f044a0f1.tar.gz | |
Merge branch 'cleanup/blocksize-diet-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index baa4031..f7555e2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3291,9 +3291,9 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group( u64 bytenr); void btrfs_put_block_group(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 btrfs_root *root, u32 blocksize, - u64 parent, u64 root_objectid, +struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, + struct btrfs_root *root, u64 parent, + u64 root_objectid, struct btrfs_disk_key *key, int level, u64 hint, u64 empty_size); void btrfs_free_tree_block(struct btrfs_trans_handle *trans, |
