Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / fs / direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index ec2fb6fe6d37c628d5335b7a0971b464824b0623..9bb015bc4a83676be822ca5bf46462ed8dafb047 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -551,7 +551,9 @@ static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio)
        if (dio->is_async && dio->op == REQ_OP_READ && dio->should_dirty) {
                bio_check_pages_dirty(bio);     /* transfers ownership */
        } else {
-               bio_for_each_segment_all(bvec, bio, i) {
+               struct bvec_iter_all iter_all;
+
+               bio_for_each_segment_all(bvec, bio, i, iter_all) {
                        struct page *page = bvec->bv_page;
 
                        if (dio->op == REQ_OP_READ && !PageCompound(page) &&