davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: remove the unused blk_integrity_merge_bio export

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2020-10-06 09:07:18 +02:00 committed by Jens Axboe
parent 92cf2fd156
commit d59da41998
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/blk-integrity.c
View File

@ -211,7 +211,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
return true; return true;
} }
EXPORT_SYMBOL(blk_integrity_merge_bio);
struct integrity_sysfs_entry { struct integrity_sysfs_entry {
struct attribute attr; struct attribute attr;

7
block/blk.h
View File

@ -122,6 +122,8 @@ static inline bool bio_integrity_endio(struct bio *bio)
bool blk_integrity_merge_rq(struct request_queue *, struct request *, bool blk_integrity_merge_rq(struct request_queue *, struct request *,
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, static inline bool integrity_req_gap_back_merge(struct request *req,
struct bio *next) struct bio *next)
@ -151,6 +153,11 @@ static inline bool blk_integrity_merge_rq(struct request_queue *rq,
{ {
return true; 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, static inline bool integrity_req_gap_back_merge(struct request *req,
struct bio *next) struct bio *next)
{ {

8
include/linux/blkdev.h
View File

@ -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 *, extern int blk_rq_map_integrity_sg(struct request_queue *, struct bio *,
struct scatterlist *); struct scatterlist *);
extern int blk_rq_count_integrity_sg(struct request_queue *, struct bio *); 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) 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; 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, static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,
unsigned int sectors) unsigned int sectors)