diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:07:10 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:07:10 -0500 |
| commit | 806468f8bf76a3cb2b626dd282946a6c9c0a50f0 (patch) | |
| tree | 2de54229a5623756417a9bad7f426a2e8b06cad7 /fs/btrfs/reada.c | |
| parent | 531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3 (diff) | |
| parent | 5da6fcbc4eb50c0f55d520750332f5a6ab13508c (diff) | |
| download | linux-806468f8bf76a3cb2b626dd282946a6c9c0a50f0.tar.gz linux-806468f8bf76a3cb2b626dd282946a6c9c0a50f0.tar.bz2 linux-806468f8bf76a3cb2b626dd282946a6c9c0a50f0.zip | |
Merge git://git.jan-o-sch.net/btrfs-unstable into integration
Conflicts:
fs/btrfs/Makefile
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/scrub.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/reada.c')
| -rw-r--r-- | fs/btrfs/reada.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c index 2b701d082227..cd857119ba8a 100644 --- a/fs/btrfs/reada.c +++ b/fs/btrfs/reada.c @@ -247,7 +247,7 @@ int btree_readahead_hook(struct btrfs_root *root, struct extent_buffer *eb, static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info, struct btrfs_device *dev, u64 logical, - struct btrfs_multi_bio *multi) + struct btrfs_bio *multi) { int ret; int looped = 0; @@ -327,7 +327,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, struct reada_extent *re = NULL; struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree; - struct btrfs_multi_bio *multi = NULL; + struct btrfs_bio *multi = NULL; struct btrfs_device *dev; u32 blocksize; u64 length; |