|
@@ -201,29 +201,28 @@ static void list_dp_init(struct dpages *dp, struct page_list *pl, unsigned offse
|
|
|
/*
|
|
|
* Functions for getting the pages from a bvec.
|
|
|
*/
|
|
|
-static void bio_get_page(struct dpages *dp,
|
|
|
- struct page **p, unsigned long *len, unsigned *offset)
|
|
|
+static void bio_get_page(struct dpages *dp, struct page **p,
|
|
|
+ unsigned long *len, unsigned *offset)
|
|
|
{
|
|
|
- struct bio *bio = dp->context_ptr;
|
|
|
- struct bio_vec bvec = bio_iovec(bio);
|
|
|
- *p = bvec.bv_page;
|
|
|
- *len = bvec.bv_len;
|
|
|
- *offset = bvec.bv_offset;
|
|
|
+ struct bio_vec *bvec = dp->context_ptr;
|
|
|
+ *p = bvec->bv_page;
|
|
|
+ *len = bvec->bv_len - dp->context_u;
|
|
|
+ *offset = bvec->bv_offset + dp->context_u;
|
|
|
}
|
|
|
|
|
|
static void bio_next_page(struct dpages *dp)
|
|
|
{
|
|
|
- struct bio *bio = dp->context_ptr;
|
|
|
- struct bio_vec bvec = bio_iovec(bio);
|
|
|
-
|
|
|
- bio_advance(bio, bvec.bv_len);
|
|
|
+ struct bio_vec *bvec = dp->context_ptr;
|
|
|
+ dp->context_ptr = bvec + 1;
|
|
|
+ dp->context_u = 0;
|
|
|
}
|
|
|
|
|
|
static void bio_dp_init(struct dpages *dp, struct bio *bio)
|
|
|
{
|
|
|
dp->get_page = bio_get_page;
|
|
|
dp->next_page = bio_next_page;
|
|
|
- dp->context_ptr = bio;
|
|
|
+ dp->context_ptr = __bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter);
|
|
|
+ dp->context_u = bio->bi_iter.bi_bvec_done;
|
|
|
}
|
|
|
|
|
|
/*
|