diff mbox series

[2/3] block: remove the unused blk_integrity_merge_bio export

Message ID 20201006070719.427627-3-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [1/3] block: remove the unused blk_integrity_merge_rq export | expand

Commit Message

Christoph Hellwig Oct. 6, 2020, 7:07 a.m. UTC 
Also move the definition from the public blkdev.h to the private
block/blk.h header.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-integrity.c  | 1 -
 block/blk.h            | 7 +++++++
 include/linux/blkdev.h | 8 --------
 3 files changed, 7 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index a262e069eb3fe6..410da060d1f5ad 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 ba4e8ac538cdc7..8fcb146d30034f 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)
 {
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1c01e724659273..a8b04af50191dc 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1663,8 +1663,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)
 {
@@ -1792,12 +1790,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)