From a7b98408fe53006450adf1d0a00d45eb371be4dc Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 15 May 2019 15:33:37 +0200 Subject: [PATCH] block: remove the unused blk_integrity_merge_bio export MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also move the definition from the public blkdev.h to the prіvate block/blk.h. Signed-off-by: Christoph Hellwig --- block/blk-integrity.c | 1 - block/blk.h | 7 +++++++ include/linux/blkdev.h | 8 -------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 0d9a256c0bca..c3e2b8efb0b7 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -211,7 +211,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req, return true; } -EXPORT_SYMBOL(blk_integrity_merge_bio); struct integrity_sysfs_entry { struct attribute attr; diff --git a/block/blk.h b/block/blk.h index b2cf371ee883..680f9b31888a 100644 --- a/block/blk.h +++ b/block/blk.h @@ -116,6 +116,8 @@ static inline bool bio_integrity_endio(struct bio *bio) bool blk_integrity_merge_rq(struct request_queue *, struct request *, struct request *); +bool blk_integrity_merge_bio(struct request_queue *, struct request *, + struct bio *); static inline bool integrity_req_gap_back_merge(struct request *req, struct bio *next) @@ -145,6 +147,11 @@ static inline bool blk_integrity_merge_rq(struct request_queue *rq, { return true; } +static inline bool blk_integrity_merge_bio(struct request_queue *rq, + struct request *r, struct bio *b) +{ + return true; +} static inline bool integrity_req_gap_back_merge(struct request *req, struct bio *next) { diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 97781e01420d..5e8cf6d225fc 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1642,8 +1642,6 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *); extern int blk_rq_map_integrity_sg(struct request_queue *, struct bio *, struct scatterlist *); extern int blk_rq_count_integrity_sg(struct request_queue *, struct bio *); -extern bool blk_integrity_merge_bio(struct request_queue *, struct request *, - struct bio *); static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk) { @@ -1771,12 +1769,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q { return 0; } -static inline bool blk_integrity_merge_bio(struct request_queue *rq, - struct request *r, - struct bio *b) -{ - return true; -} static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi, unsigned int sectors) -- 2.50.1