block: remove the unused blk_integrity_merge_bio export

Christoph Hellwig · axboe · commit d59da41998bc · 2020-10-06T07:29:53.000-06:00
Also move the definition from the public blkdev.h to the private
block/blk.h header.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git 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
@@ -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
@@ -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_bio(struct request_queue *, struct request *,
-				    struct bio *);
 
 static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)
 {
@@ -1793,12 +1791,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)

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,6 @@ bool blk_integrity_merge_bio(struct request_queue q, struct request req,`
`211`	`211`
`212`	`212`	`return true;`
`213`	`213`	`}`
`214`		`-EXPORT_SYMBOL(blk_integrity_merge_bio);`
`215`	`214`
`216`	`215`	`struct integrity_sysfs_entry {`
`217`	`216`	`struct attribute attr;`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ static inline bool bio_integrity_endio(struct bio *bio)`
`122`	`122`
`123`	`123`	`bool blk_integrity_merge_rq(struct request_queue , struct request ,`
`124`	`124`	`struct request *);`
	`125`	`+bool blk_integrity_merge_bio(struct request_queue , struct request ,`
	`126`	`+ struct bio *);`
`125`	`127`
`126`	`128`	`static inline bool integrity_req_gap_back_merge(struct request *req,`
`127`	`129`	`struct bio *next)`
`@@ -151,6 +153,11 @@ static inline bool blk_integrity_merge_rq(struct request_queue *rq,`
`151`	`153`	`{`
`152`	`154`	`return true;`
`153`	`155`	`}`
	`156`	`+static inline bool blk_integrity_merge_bio(struct request_queue *rq,`
	`157`	`+ struct request r, struct bio b)`
	`158`	`+{`
	`159`	`+ return true;`
	`160`	`+}`
`154`	`161`	`static inline bool integrity_req_gap_back_merge(struct request *req,`
`155`	`162`	`struct bio *next)`
`156`	`163`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1664,8 +1664,6 @@ extern int blk_integrity_compare(struct gendisk , struct gendisk );`
`1664`	`1664`	`extern int blk_rq_map_integrity_sg(struct request_queue , struct bio ,`
`1665`	`1665`	`struct scatterlist *);`
`1666`	`1666`	`extern int blk_rq_count_integrity_sg(struct request_queue , struct bio );`
`1667`		`-extern bool blk_integrity_merge_bio(struct request_queue , struct request ,`
`1668`		`- struct bio *);`
`1669`	`1667`
`1670`	`1668`	`static inline struct blk_integrity blk_get_integrity(struct gendisk disk)`
`1671`	`1669`	`{`
`@@ -1793,12 +1791,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q`
`1793`	`1791`	`{`
`1794`	`1792`	`return 0;`
`1795`	`1793`	`}`
`1796`		`-static inline bool blk_integrity_merge_bio(struct request_queue *rq,`
`1797`		`- struct request *r,`
`1798`		`- struct bio *b)`
`1799`		`-{`
`1800`		`- return true;`
`1801`		`-}`
`1802`	`1794`
`1803`	`1795`	`static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,`
`1804`	`1796`	`unsigned int sectors)`