summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-10-06 09:07:17 +0200
committerJens Axboe <axboe@kernel.dk>2020-10-06 07:29:53 -0600
commit92cf2fd156b273879198bb1d7e58851f822c481f (patch)
tree98ade8395aca823be062425f46f7f41f022edbae /block
parent0549e87c30ae0d43d7e10424f2222bcd8bbe986d (diff)
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 'block')
-rw-r--r--block/blk-integrity.c1
-rw-r--r--block/blk.h8
2 files changed, 8 insertions, 1 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 2b36a8f9b813..a262e069eb3f 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -183,7 +183,6 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,
return true;
}
-EXPORT_SYMBOL(blk_integrity_merge_rq);
bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
struct bio *bio)
diff --git a/block/blk.h b/block/blk.h
index c08762e10b04..ba4e8ac538cd 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -120,6 +120,9 @@ static inline bool bio_integrity_endio(struct bio *bio)
return true;
}
+bool blk_integrity_merge_rq(struct request_queue *, struct request *,
+ struct request *);
+
static inline bool integrity_req_gap_back_merge(struct request *req,
struct bio *next)
{
@@ -143,6 +146,11 @@ static inline bool integrity_req_gap_front_merge(struct request *req,
void blk_integrity_add(struct gendisk *);
void blk_integrity_del(struct gendisk *);
#else /* CONFIG_BLK_DEV_INTEGRITY */
+static inline bool blk_integrity_merge_rq(struct request_queue *rq,
+ struct request *r1, struct request *r2)
+{
+ return true;
+}
static inline bool integrity_req_gap_back_merge(struct request *req,
struct bio *next)
{