lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.jan-o-sch.net/btrfs-unstable into integration

Browse Source 
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>
This commit is contained in:
Chris Mason
2011-11-06 03:07:10 -05:00
parent 531f4b1ae5 5da6fcbc4e
commit 806468f8bf
14 changed files with 1930 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/reada.c
View File

@@ -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;