diff options
| author | Chris Mason <clm@fb.com> | 2015-01-21 17:49:35 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-01-21 17:49:35 -0800 |
| commit | 57bbddd7fbf468336940d18a4c68a8678163acb0 (patch) | |
| tree | 5d9c5ecf6ba145cdaf369e0c6ddfc4ea88ce8dd9 /fs/btrfs/disk-io.h | |
| parent | d3541834884f042aaaab1d6c0610cdc3488028e4 (diff) | |
| parent | ce3e69847e3ec79a38421bfd3d6f554d5e481231 (diff) | |
| download | linux-57bbddd7fbf468336940d18a4c68a8678163acb0.tar.gz linux-57bbddd7fbf468336940d18a4c68a8678163acb0.tar.bz2 linux-57bbddd7fbf468336940d18a4c68a8678163acb0.zip | |
Merge branch 'cleanup/blocksize-diet-part2' 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 414651821fb3..27d44c0fd236 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -46,11 +46,11 @@ struct btrfs_fs_devices; struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, 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, +void readahead_tree_block(struct btrfs_root *root, u64 bytenr); +int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, int mirror_num, struct extent_buffer **eb); struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, - u64 bytenr, u32 blocksize); + u64 bytenr); void clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct extent_buffer *buf); int open_ctree(struct super_block *sb, |