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/disk-io.c | |
| parent | 531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3 (diff) | |
| parent | 5da6fcbc4eb50c0f55d520750332f5a6ab13508c (diff) | |
| download | linux-rpi-806468f8bf76a3cb2b626dd282946a6c9c0a50f0.tar.gz linux-rpi-806468f8bf76a3cb2b626dd282946a6c9c0a50f0.tar.bz2 linux-rpi-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/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index cedfbfb278eb..0eb1f0951251 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -620,7 +620,7 @@ out: static int btree_io_failed_hook(struct bio *failed_bio, struct page *page, u64 start, u64 end, - struct extent_state *state) + u64 mirror_num, struct extent_state *state) { struct extent_io_tree *tree; unsigned long len; @@ -944,7 +944,7 @@ static int btree_readpage(struct file *file, struct page *page) { struct extent_io_tree *tree; tree = &BTRFS_I(page->mapping->host)->io_tree; - return extent_read_full_page(tree, page, btree_get_extent); + return extent_read_full_page(tree, page, btree_get_extent, 0); } static int btree_releasepage(struct page *page, gfp_t gfp_flags) |