summaryrefslogtreecommitdiffstats
path: root/include/linux/bio.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-07-03 16:58:43 -0600
committerJens Axboe <axboe@kernel.dk>2017-07-03 17:00:59 -0600
commit7c20f11680a441df09de7235206f70115fbf6290 (patch)
tree90d50d07813a45cc1454b730a76a85a92a0cdd5a /include/linux/bio.h
parent63573e359d052e506d305c263576499f06355985 (diff)
downloadlinux-stable-7c20f11680a441df09de7235206f70115fbf6290.tar.gz
linux-stable-7c20f11680a441df09de7235206f70115fbf6290.tar.bz2
linux-stable-7c20f11680a441df09de7235206f70115fbf6290.zip
bio-integrity: stop abusing bi_end_io
And instead call directly into the integrity code from bio_end_io. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/bio.h')
-rw-r--r--include/linux/bio.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 1eba19580185..7b1cf4ba0902 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -320,8 +320,6 @@ struct bio_integrity_payload {
struct bvec_iter bip_iter;
- bio_end_io_t *bip_end_io; /* saved I/O completion fn */
-
unsigned short bip_slab; /* slab the bip came from */
unsigned short bip_vcnt; /* # of integrity bio_vecs */
unsigned short bip_max_vcnt; /* integrity bio_vec slots */
@@ -739,10 +737,8 @@ struct biovec_slab {
bip_for_each_vec(_bvl, _bio->bi_integrity, _iter)
extern struct bio_integrity_payload *bio_integrity_alloc(struct bio *, gfp_t, unsigned int);
-extern void bio_integrity_free(struct bio *);
extern int bio_integrity_add_page(struct bio *, struct page *, unsigned int, unsigned int);
extern bool bio_integrity_prep(struct bio *);
-extern void bio_integrity_endio(struct bio *);
extern void bio_integrity_advance(struct bio *, unsigned int);
extern void bio_integrity_trim(struct bio *);
extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t);
@@ -772,11 +768,6 @@ static inline bool bio_integrity_prep(struct bio *bio)
return true;
}
-static inline void bio_integrity_free(struct bio *bio)
-{
- return;
-}
-
static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
gfp_t gfp_mask)
{