Commit 92cf2fd1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0549e87c

block/blk-integrity.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

block/blk.h

+8 −0
Original line number Diff line number Diff line
@@ -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)

{

include/linux/blkdev.h

+0 −8
Original line number Diff line number Diff line
@@ -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)