diff options
| author | Richard Yao <[email protected]> | 2014-07-06 20:30:33 -0400 |
|---|---|---|
| committer | Richard Yao <[email protected]> | 2015-09-04 15:37:24 -0400 |
| commit | 9ddf9b8e1587ec7112913a6b5e1f82e468a891b6 (patch) | |
| tree | bd4e747091708076efaf841b45270989c78db096 /include/linux/blkdev_compat.h | |
| parent | fa56567630cfad95b77dee507595d77f24e99cb9 (diff) | |
Remove rq_for_each_segment() autotools check
Signed-off-by: Richard Yao <[email protected]>
Diffstat (limited to 'include/linux/blkdev_compat.h')
| -rw-r--r-- | include/linux/blkdev_compat.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 0b5c8af42..b2b641840 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -249,48 +249,6 @@ rq_is_sync(struct request *req) } #endif /* HAVE_RQ_IS_SYNC */ -#ifndef HAVE_RQ_FOR_EACH_SEGMENT -struct req_iterator { - int i; - struct bio *bio; -}; - -#define for_each_bio(_bio) \ - for (; _bio; _bio = _bio->bi_next) - -#define __rq_for_each_bio(_bio, rq) \ - if ((rq->bio)) \ - for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next) - -#define rq_for_each_segment(bvl, _rq, _iter) \ - __rq_for_each_bio(_iter.bio, _rq) \ - bio_for_each_segment(bvl, _iter.bio, _iter.i) - -#define HAVE_RQ_FOR_EACH_SEGMENT_BVP 1 -#endif /* HAVE_RQ_FOR_EACH_SEGMENT */ - -/* - * 3.14 API change - * rq_for_each_segment changed from taking bio_vec * to taking bio_vec. - * We provide rq_for_each_segment4 which takes both. - * You should not modify the fields in @bv and @bvp. - * - * Note: the if-else is just to inject the assignment before the loop body. - */ -#ifdef HAVE_RQ_FOR_EACH_SEGMENT_BVP -#define rq_for_each_segment4(bv, bvp, rq, iter) \ - rq_for_each_segment(bvp, rq, iter) \ - if ((bv = *bvp), 0) \ - ; \ - else -#else -#define rq_for_each_segment4(bv, bvp, rq, iter) \ - rq_for_each_segment(bv, rq, iter) \ - if ((bvp = &bv), 0) \ - ; \ - else -#endif - #ifdef HAVE_BIO_BVEC_ITER #define BIO_BI_SECTOR(bio) (bio)->bi_iter.bi_sector #define BIO_BI_SIZE(bio) (bio)->bi_iter.bi_size |