diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-11-06 09:05:08 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-11-06 09:05:08 +0100 |
| commit | 531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3 (patch) | |
| tree | 63efdfe9b192243fefb76be3921b9a2aaa26291e /fs/btrfs/extent_io.c | |
| parent | Btrfs: fix delayed insertion reservation (diff) | |
| parent | btrfs: use readahead API for scrub (diff) | |
| download | linux-531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3.tar.xz linux-531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3.zip | |
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/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index cc3c58970d4e..c12705682c65 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -1919,7 +1919,7 @@ static void end_bio_extent_readpage(struct bio *bio, int err) if (!uptodate && tree->ops && tree->ops->readpage_io_failed_hook) { ret = tree->ops->readpage_io_failed_hook(bio, page, - start, end, NULL); + start, end, state); if (ret == 0) { uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); @@ -3551,8 +3551,7 @@ int extent_buffer_uptodate(struct extent_io_tree *tree, } int read_extent_buffer_pages(struct extent_io_tree *tree, - struct extent_buffer *eb, - u64 start, int wait, + struct extent_buffer *eb, u64 start, int wait, get_extent_t *get_extent, int mirror_num) { unsigned long i; @@ -3588,7 +3587,7 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, num_pages = num_extent_pages(eb->start, eb->len); for (i = start_i; i < num_pages; i++) { page = extent_buffer_page(eb, i); - if (!wait) { + if (wait == WAIT_NONE) { if (!trylock_page(page)) goto unlock_exit; } else { @@ -3632,7 +3631,7 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, if (bio) submit_one_bio(READ, bio, mirror_num, bio_flags); - if (ret || !wait) + if (ret || wait != WAIT_COMPLETE) return ret; for (i = start_i; i < num_pages; i++) { |