diff options
author | Kent Overstreet <kmo@daterainc.com> | 2013-08-07 17:33:00 -0400 |
---|---|---|
committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-24 01:33:57 -0500 |
commit | 4b1faf931650d4a35b2a570318862821d6a962e3 (patch) | |
tree | 1e9002a82c7108ea8d54efa2bb88537b2f6f4e11 /include/linux/bio.h | |
parent | 20d0189b1012a37d2533a87fb451f7852f2418d1 (diff) |
block: Kill bio_pair_split()
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/bio.h')
-rw-r--r-- | include/linux/bio.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 19e31b2f5b2c..70654521dab6 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
@@ -297,30 +297,7 @@ struct bio_integrity_payload { | |||
297 | }; | 297 | }; |
298 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ | 298 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ |
299 | 299 | ||
300 | /* | ||
301 | * A bio_pair is used when we need to split a bio. | ||
302 | * This can only happen for a bio that refers to just one | ||
303 | * page of data, and in the unusual situation when the | ||
304 | * page crosses a chunk/device boundary | ||
305 | * | ||
306 | * The address of the master bio is stored in bio1.bi_private | ||
307 | * The address of the pool the pair was allocated from is stored | ||
308 | * in bio2.bi_private | ||
309 | */ | ||
310 | struct bio_pair { | ||
311 | struct bio bio1, bio2; | ||
312 | struct bio_vec bv1, bv2; | ||
313 | #if defined(CONFIG_BLK_DEV_INTEGRITY) | ||
314 | struct bio_integrity_payload bip1, bip2; | ||
315 | struct bio_vec iv1, iv2; | ||
316 | #endif | ||
317 | atomic_t cnt; | ||
318 | int error; | ||
319 | }; | ||
320 | extern struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors); | ||
321 | extern void bio_pair_release(struct bio_pair *dbio); | ||
322 | extern void bio_trim(struct bio *bio, int offset, int size); | 300 | extern void bio_trim(struct bio *bio, int offset, int size); |
323 | |||
324 | extern struct bio *bio_split(struct bio *bio, int sectors, | 301 | extern struct bio *bio_split(struct bio *bio, int sectors, |
325 | gfp_t gfp, struct bio_set *bs); | 302 | gfp_t gfp, struct bio_set *bs); |
326 | 303 | ||
@@ -677,7 +654,6 @@ extern int bio_integrity_prep(struct bio *); | |||
677 | extern void bio_integrity_endio(struct bio *, int); | 654 | extern void bio_integrity_endio(struct bio *, int); |
678 | extern void bio_integrity_advance(struct bio *, unsigned int); | 655 | extern void bio_integrity_advance(struct bio *, unsigned int); |
679 | extern void bio_integrity_trim(struct bio *, unsigned int, unsigned int); | 656 | extern void bio_integrity_trim(struct bio *, unsigned int, unsigned int); |
680 | extern void bio_integrity_split(struct bio *, struct bio_pair *, int); | ||
681 | extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t); | 657 | extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t); |
682 | extern int bioset_integrity_create(struct bio_set *, int); | 658 | extern int bioset_integrity_create(struct bio_set *, int); |
683 | extern void bioset_integrity_free(struct bio_set *); | 659 | extern void bioset_integrity_free(struct bio_set *); |
@@ -721,12 +697,6 @@ static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src, | |||
721 | return 0; | 697 | return 0; |
722 | } | 698 | } |
723 | 699 | ||
724 | static inline void bio_integrity_split(struct bio *bio, struct bio_pair *bp, | ||
725 | int sectors) | ||
726 | { | ||
727 | return; | ||
728 | } | ||
729 | |||
730 | static inline void bio_integrity_advance(struct bio *bio, | 700 | static inline void bio_integrity_advance(struct bio *bio, |
731 | unsigned int bytes_done) | 701 | unsigned int bytes_done) |
732 | { | 702 | { |