diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-10-06 09:07:17 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-10-06 15:29:53 +0200 |
| commit | 92cf2fd156b273879198bb1d7e58851f822c481f (patch) | |
| tree | 98ade8395aca823be062425f46f7f41f022edbae /include | |
| parent | block: move 'q_usage_counter' into front of 'request_queue' (diff) | |
| download | linux-92cf2fd156b273879198bb1d7e58851f822c481f.tar.xz linux-92cf2fd156b273879198bb1d7e58851f822c481f.zip | |
block: remove the unused blk_integrity_merge_rq 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 'include')
| -rw-r--r-- | include/linux/blkdev.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5fc940423e5a..6a6d9ea7420a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1664,8 +1664,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_rq(struct request_queue *, struct request *, - struct request *); extern bool blk_integrity_merge_bio(struct request_queue *, struct request *, struct bio *); @@ -1795,12 +1793,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q { return 0; } -static inline bool blk_integrity_merge_rq(struct request_queue *rq, - struct request *r1, - struct request *r2) -{ - return true; -} static inline bool blk_integrity_merge_bio(struct request_queue *rq, struct request *r, struct bio *b) |