diff options
| author | Chris Mason <clm@fb.com> | 2014-10-04 18:57:14 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-04 18:57:14 +0200 |
| commit | 27b19cc8864e206c4203041892b0f706f044a0f1 (patch) | |
| tree | f724dd77efa379da881fba7f46075af17a728bf9 /fs/btrfs/disk-io.h | |
| parent | Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | btrfs: remove blocksize from btrfs_alloc_free_block and rename (diff) | |
| download | linux-27b19cc8864e206c4203041892b0f706f044a0f1.tar.xz linux-27b19cc8864e206c4203041892b0f706f044a0f1.zip | |
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/disk-io.h')
| -rw-r--r-- | fs/btrfs/disk-io.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 9ac233923ca3..414651821fb3 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -45,9 +45,8 @@ struct btrfs_device; struct btrfs_fs_devices; struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, - u32 blocksize, u64 parent_transid); -int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, - u64 parent_transid); + u64 parent_transid); +void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize); int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, int mirror_num, struct extent_buffer **eb); struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, @@ -63,7 +62,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans, struct buffer_head *btrfs_read_dev_super(struct block_device *bdev); int btrfs_commit_super(struct btrfs_root *root); struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root, - u64 bytenr, u32 blocksize); + u64 bytenr); struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root, struct btrfs_key *location); int btrfs_init_fs_root(struct btrfs_root *root); |