diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:05:08 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:05:08 -0500 |
| commit | 531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3 (patch) | |
| tree | 63efdfe9b192243fefb76be3921b9a2aaa26291e /fs/btrfs/disk-io.h | |
| parent | c06a0e120a4e381a1c291c1fce3c6155c5791cae (diff) | |
| parent | 7a26285eea8eb92e0088db011571d887d4551b0f (diff) | |
Merge branch 'for-chris' of git://github.com/sensille/linux into integration
Conflicts:
fs/btrfs/ctree.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.h')
| -rw-r--r-- | fs/btrfs/disk-io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index e678539c8519..c99d0a8f13fa 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h | |||
| @@ -40,6 +40,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, | |||
| 40 | u32 blocksize, u64 parent_transid); | 40 | u32 blocksize, u64 parent_transid); |
| 41 | int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, | 41 | int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, |
| 42 | u64 parent_transid); | 42 | u64 parent_transid); |
| 43 | int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, | ||
| 44 | int mirror_num, struct extent_buffer **eb); | ||
| 43 | struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, | 45 | struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, |
| 44 | u64 bytenr, u32 blocksize); | 46 | u64 bytenr, u32 blocksize); |
| 45 | int clean_tree_block(struct btrfs_trans_handle *trans, | 47 | int clean_tree_block(struct btrfs_trans_handle *trans, |