diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-10-06 09:07:18 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-10-06 15:29:53 +0200 |
| commit | d59da41998bc794441d7c039a059ed6eb0c2dc4d (patch) | |
| tree | 0fb13916c406c26af056e917b10923628768b0fe /block | |
| parent | block: remove the unused blk_integrity_merge_rq export (diff) | |
| download | linux-d59da41998bc794441d7c039a059ed6eb0c2dc4d.tar.xz linux-d59da41998bc794441d7c039a059ed6eb0c2dc4d.zip | |
block: remove the unused blk_integrity_merge_bio export
Also move the definition from the public blkdev.h to the private
block/blk.h header.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-integrity.c | 1 | ||||
| -rw-r--r-- | block/blk.h | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index a262e069eb3f..410da060d1f5 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 ba4e8ac538cd..8fcb146d3003 100644 --- a/block/blk.h +++ b/block/blk.h @@ -122,6 +122,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) @@ -151,6 +153,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) { |